Sort out changelog

[secnet] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 06ea112..7ac915a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,24 +1,26 @@
 # Makefile for secnet
-# Copyright (C) 1995-2001 Stephen Early <steve@greenend.org.uk>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
+#
+# This file is part of secnet.
+# See README for full list of copyright holders.
+#
+# secnet is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version d of the License, or
+# (at your option) any later version.
+# 
+# secnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# version 3 along with secnet; if not, see
+# https://www.gnu.org/licenses/gpl.html.
 
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.4.0~~iwj~
+VERSION:=0.4.0~beta1
 
 @SET_MAKE@
 
@@ -31,11 +33,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 +78,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 +184,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 +195,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 \