X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=Makefile;h=946dbbc943da34211151c55203a758e31d48c8f7;hb=a6238294b80a2d98d3768131a457d00f4b2b9578;hp=cee9a5b6f48163781b21141b33e162be2dcbeb0b;hpb=c593cf1bd8dc2bfe6c0e6958757f30944ea3ab50;p=rrq%2Frrqnet.git

diff --git a/Makefile b/Makefile
index cee9a5b..946dbbc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,21 @@
-SBINDIR = $(DESTDIR)/usr/local/sbin
+SBINDIR = $(DESTDIR)/usr/sbin
 ETCDIR = $(DESTDIR)/etc/rrqnet
-MAN1DIR = $(DESTDIR)/usr/local/share/man/man1
-MAN8DIR = $(DESTDIR)/usr/local/share/man/man8
+MAN1DIR = $(DESTDIR)/usr/share/man/man1
+MAN8DIR = $(DESTDIR)/usr/share/man/man8
 
-SBINFILES = rrqnet rrqnet-cron.sh
-ETCFILES = set-source-route.sh
+SBINCFILES = rrqnet
+SBINFILES = rrqnet-cron $(SBINCFILES)
+ETCFILES = set-source-route.sh ifupdown.sh
 MAN1FILES = 
-MAN8FILES = rrqnet.8 rrqnet-cron.sh.8
+MAN8FILES = rrqnet.8 rrqnet-cron.8 rrqnet-ifupdown.sh.8
 HTMLDOC = $(MAN8FILES:%=%.html)
 
+.PHONY: ifupdown.sh
+
 all: $(SBINFILES) $(ETCFILES) $(MAN1FILES) $(MAN8FILES) $(HTMLDOC)
 
+squeezetest: squeeze.c squeezetest.c
+
 $(HTMLDOC): %.html: %.adoc
 	asciidoc -bhtml $^
 
@@ -26,12 +31,13 @@ rrqnet.E: rrqnet.c htable.c
 COMPILEOPTS = -g -W -Wall
 #COMPILEOPTS = -pg -no-pie  -g -DGPROF
 
-$(filter-out %.sh,$(SBINFILES)): %: %.c 
-	$(CC) $(COMPILEOPTS) -static -o $@ $^ $(LDFLAGS)
+#STATIC = -static
+$(filter-out %.sh,$(SBINCFILES)): %: %.c 
+	$(CC) $(COMPILEOPTS) $(STATIC) -o $@ $^ $(LDFLAGS)
 
 .PHONY: clean
 clean:
-	rm -f $(filter-out %.sh,$(SBINFILES))
+	rm -f $(filter-out %.sh,$(SBINCFILES))
 
 # Installation targets
 
@@ -46,7 +52,7 @@ INSTALL = install
 $(addprefix $(ETCDIR)/,conf.d keys):
 	mkdir -p $@
 
-$(ETCCFG)/cron.sh: rrqnet-cron.sh
+$(ETCDIR)/ifupdown.sh: rrqnet-ifupdown.sh
 	$(INSTALL) -D -T $< $@
 
 $(SBINDIR)/% $(ETCDIR)/% $(MAN1DIR)/% $(MAN8DIR)/%: %