From e250348a36edbf9b92d548770b03aad364c29dce Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 15 Sep 2014 00:47:13 +0100 Subject: [PATCH] Python IP addresses: Check for and maybe delete stale ipaddr.py If ipaddr.py (or .pyc) from a previous secnet installation still exists in /usr/share/secnet or /usr/local/share/secnet, this version won't work. Check for this situation in `make install' and bomb out. Provide a `make install-force' which deletes the spurious files. Signed-off-by: Ian Jackson --- Makefile.in | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Makefile.in b/Makefile.in index 5ebc28d..a6ac640 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,6 +69,12 @@ OBJECTS:=version.o TEST_OBJECTS:= endif +STALE_PYTHON_FILES= $(foreach e, py pyc, \ + $(foreach p, /usr /usr/local, \ + $(foreach l, ipaddr, \ + $p/share/secnet/$l.$e \ + ))) + %.c: %.y %.yy.c: %.fl @@ -161,11 +167,23 @@ installdirs: $(INSTALL) -d $(mandir)/man8 install: installdirs + set -e; ok=true; for f in $(STALE_PYTHON_FILES); do \ + if test -e $$f; then \ + echo >&2 "ERROR: $$f still exists "\ + "- try \`make install-force'"; \ + ok=false; \ + fi; \ + done; \ + $$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) secnet.8 $(mandir)/man8/secnet.8 +install-force: + rm -f $(STALE_PYTHON_FILES) + $(MAKE) install + clean: $(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c $(RM) -f *.d *~ eax-*-test.confirm eax-*-test -- 2.30.2