Makefile-2.2.diff

Makefile-2.2.diff (text/plain), 2.38 KB, created by Emery Hemingway on 2013-07-26 20:54:10 UTC

diff -ur old/eb-2.2/Makefile new/eb-2.2/Makefile
--- old/eb-2.2/Makefile	2013-05-17 05:07:09.000000000 -0500
+++ new/eb-2.2/Makefile	2013-07-25 23:38:34.607047075 -0500
@@ -4,16 +4,16 @@
 
 -include makefile.inc
 
-PREFIX=/usr/local/entropybroker
-BIN=$(PREFIX)/bin
-ETC=$(PREFIX)/etc
-VAR=$(PREFIX)/var
-CACHE=$(VAR)/cache
-PID=$(VAR)/run
+PREFIX=$(ROOT)/usr
+BIN=$(PREFIX)/sbin
+ETC=$(ROOT)/etc
+VAR=$(ROOT)/var
+CACHE=$(VAR)/cache/entropybroker
+PID=$(ROOT)/run/entropybroker
 MAN=$(PREFIX)/share/man
-WEB=$(PREFIX)/share/eb/web
-DOC=$(PREFIX)/doc
-FONT=/usr/share/fonts/truetype/freefont/FreeMono.ttf
+DOC=$(PREFIX)/share/doc/$(P)
+WEB=$(PREFIX)/share/$(P)/web
+FONT=$(ROOT)/usr/share/fonts/truetype/freefont/FreeMono.ttf
 
 CXX=g++
 DEBUG= # -pg #-DHELGRIND #-DCRYPTO_DEBUG #-D_DEBUG #-fprofile-arcs -ftest-coverage # -pg
@@ -147,23 +147,23 @@
 	$(CXX) $(LINT) plot.o $(LDFLAGS) -lpng -o plot
 
 install:
-	mkdir -p $(BIN) $(ETC) $(VAR) $(PID) $(CACHE)
+	mkdir -p $(D)/$(BIN) $(D)/$(ETC) $(D)/$(VAR) $(D)/$(PID) $(D)/$(CACHE)
 	for file in $(BINARIES) ; do \
-		test -e $$file && cp $$file $(BIN) ; \
+		test -e $$file && cp $$file $(D)/$(BIN) ; \
 		test -e $$file || echo Skipping $$file which was not build ; \
 	done
-	test -e $(BIN)/eb_client_file && \
-		(test -e $(BIN)/eb_client_kernel_generic || \
-		ln $(BIN)/eb_client_file $(BIN)/eb_client_kernel_generic)
-	test -e $(ETC)/entropy_broker.conf || cp entropy_broker.conf $(ETC)
-	test -e $(ETC)/entropy_broker.conf && cp entropy_broker.conf $(ETC)/entropy_broker.conf.dist
-	test -e $(ETC)/users.txt || (cp users.txt $(ETC) ; chmod 600 $(ETC)/users.txt)
-	mkdir -p $(MAN)/man8
-	cp doc/man/* $(MAN)/man8
-	mkdir -p $(DOC)/entropy_broker
-	cp *txt license.* $(DOC)/entropy_broker
-	mkdir -p $(WEB)
-	cp web/* $(WEB)
+	test -e $(D)/$(BIN)/eb_client_file && \
+		(test -e $(D)/$(BIN)/eb_client_kernel_generic || \
+		ln $(D)$(BIN)/eb_client_file $(D)/$(BIN)/eb_client_kernel_generic)
+	test -e $(D)/$(ETC)/entropy_broker.conf || cp entropy_broker.conf $(D)/$(ETC)
+	test -e $(D)/$(ETC)/entropy_broker.conf && cp entropy_broker.conf $(D)/$(ETC)/entropy_broker.conf.dist
+	test -e $(D)/$(ETC)/users.txt || (cp users.txt $(D)/$(ETC) ; chmod 600 $(D)/$(ETC)/users.txt)
+	mkdir -p $(D)/$(MAN)/man8
+	cp doc/man/* $(D)/$(MAN)/man8
+	mkdir -p $(D)/$(DOC)
+	cp *txt license.* $(D)/$(DOC)/
+	mkdir -p $(D)/$(WEB)
+	cp web/* $(D)/$(WEB)
 
 install_redhat_init:
 	cp redhat/* /etc/init.d