bump version to 4.2-3

[pve-firewall.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 2280abde2b4c6cae607d753b20d39d7cd60738fc..0f877e894f9a3ce75ff0c7c9256b015c9a3880b0 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,14 +1,13 @@
-
-export PREFIX=/usr
-export BINDIR=${PREFIX}/bin
-export SBINDIR=${PREFIX}/sbin
-export MANDIR=${PREFIX}/share/man
-export DOCDIR=${PREFIX}/share/doc/pve-firewall
-export MAN1DIR=${MANDIR}/man1/
-export MAN8DIR=${MANDIR}/man8/
-export PERLDIR=${PREFIX}/share/perl5
-export BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions
-export ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions
+DESTDIR=
+PREFIX= /usr
+BINDIR=${DESTDIR}/${PREFIX}/bin
+SBINDIR=${DESTDIR}/${PREFIX}/sbin
+MANDIR=${DESTDIR}/${PREFIX}/share/man
+DOCDIR=${DESTDIR}/${PREFIX}/share/doc/pve-firewall
+MAN1DIR=${MANDIR}/man1/
+MAN8DIR=${MANDIR}/man8/
+BASHCOMPLDIR=${DESTDIR}/${PREFIX}/share/bash-completion/completions
+ZSHCOMPLDIR=${DESTDIR}/${PREFIX}/share/zsh/vendor-completions
 
 export NOVIEW=1
 include /usr/share/pve-doc-generator/pve-doc-generator.mk
@@ -23,25 +22,23 @@ pve-firewall.zsh-completion: PVE/Service/pve_firewall.pm
        perl -I. -T -e "use PVE::Service::pve_firewall; PVE::Service::pve_firewall->generate_zsh_completions();" >$@.tmp
        mv $@.tmp $@
 
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CFLAGS+=$(shell pkg-config libnetfilter_log libnetfilter_conntrack glib-2.0 --libs --cflags)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 pvefw-logger: pvefw-logger.c
-       gcc -Wall -Werror pvefw-logger.c -o pvefw-logger -std=gnu99 \
-       $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
-       $(shell pkg-config libnetfilter_log libnetfilter_conntrack glib-2.0 --libs --cflags)
+       gcc -Wall -Werror pvefw-logger.c -o pvefw-logger -std=gnu99 $(CFLAGS) $(LDFLAGS)
 
 .PHONY: install
 install: pve-firewall pve-firewall.8 pve-firewall.bash-completion pve-firewall.zsh-completion pvefw-logger
        make -C PVE install
-       install -d -m 0755 ${DESTDIR}/${SBINDIR}
-       install -m 0755 pve-firewall ${DESTDIR}/${SBINDIR}
-       install -m 0755 pvefw-logger ${DESTDIR}/${SBINDIR}
-       install -d ${DESTDIR}/${MAN8DIR}
-       install -m 0644 pve-firewall.8 ${DESTDIR}/${MAN8DIR}
-       install -m 0644 -D pve-firewall.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/pve-firewall
-       install -m 0644 -D pve-firewall.zsh-completion ${DESTDIR}/${ZSHCOMPLDIR}/_pve-firewall
+       install -d -m 0755 ${SBINDIR}
+       install -m 0755 pve-firewall ${SBINDIR}
+       install -m 0755 pvefw-logger ${SBINDIR}
+       install -d ${MAN8DIR}
+       install -m 0644 pve-firewall.8 ${MAN8DIR}
+       install -m 0644 -D pve-firewall.bash-completion ${BASHCOMPLDIR}/pve-firewall
+       install -m 0644 -D pve-firewall.zsh-completion ${ZSHCOMPLDIR}/_pve-firewall
        install -d -m 0755 ${DESTDIR}/usr/lib/sysctl.d/
        install -m 0644 pve-firewall-sysctl.conf ${DESTDIR}/usr/lib/sysctl.d/pve-firewall.conf
 
@@ -55,4 +52,3 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-