X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.in;h=8ccb29aca1368212ae95777aacd80bb6a675f01e;hb=9c7a0b4e57f18adee8545804e34667334c426635;hp=06ea112c6bac31d920f7f0422eaa29f7587c1ffd;hpb=c26f37f0ae2ce7bc208c3e66c9b0f0afcb247f42;p=secnet.git

diff --git a/Makefile.in b/Makefile.in
index 06ea112..8ccb29a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.4.0~~iwj~
+VERSION:=0.4.0~beta1
 
 @SET_MAKE@
 
@@ -31,11 +31,12 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 INSTALL_SCRIPT:=@INSTALL_SCRIPT@
+INSTALL_DATA:=@INSTALL_DATA@
 
-prefix:=@prefix@
+prefix:=$(DESTDIR)@prefix@
 exec_prefix:=@exec_prefix@
 sbindir:=@sbindir@
-sysconfdir:=@sysconfdir@
+sysconfdir:=$(DESTDIR)@sysconfdir@
 datarootdir:=@datarootdir@
 transform:=@program_transform_name@
 mandir:=@mandir@
@@ -75,7 +76,7 @@ endif
 STALE_PYTHON_FILES=	$(foreach e, py pyc, \
 			$(foreach p, /usr /usr/local, \
 			$(foreach l, ipaddr, \
-			$p/share/secnet/$l.$e \
+			$(DESTDIR)$p/share/secnet/$l.$e \
 			)))
 
 %.c:	%.y
@@ -181,10 +182,10 @@ install: installdirs
 	$$ok
 	$(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'`
 	$(INSTALL_PROGRAM) ${srcdir}/make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'`
-	$(INSTALL) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
+	$(INSTALL_DATA) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
 	$(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
 		$(datarootdir)/secnet/.
-	$(INSTALL) secnet.8 $(mandir)/man8/secnet.8
+	$(INSTALL_DATA) secnet.8 $(mandir)/man8/secnet.8
 
 install-force:
 	rm -f $(STALE_PYTHON_FILES)
@@ -192,7 +193,7 @@ install-force:
 
 clean:
 	$(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
-	$(RM) -f *.d *~ eax-*-test.confirm eax-*-test
+	$(RM) -f *.d *.pyc *~ eax-*-test.confirm eax-*-test
 
 realclean:	clean
 	$(RM) -f *~ Makefile config.h  *.d \