Ticket #40400: patch-make.diff

Makefile

@@ -14 +14 @@
 #
 # Usage:
 #       make [platform=<your platform>] [DEBUG=1] all
-#       make [platform=<your platform>] <installdir=/path/to/install> install
+#       make [platform=<your platform>] <DESTDIR=/path/to/install> install
 #       This makefile will attempt to detect your platform if not supplied.
 #
 # Author: Charles Nepveu
@@ -45 +45 @@
 PLATFORM      :=$(shell [ -z "$(platform)" ] && uname | tr "[A-Z]" "[a-z]" || echo "$(platform)" )
 SUPPORTED_PLATFORMS=linux netbsd freebsd openbsd darwin sunos gogocpe
 
-INSTALL_DIR   :=$(installdir)
-INSTALL_BIN   :=$(INSTALL_DIR)/bin
-INSTALL_MAN   :=$(INSTALL_DIR)/man
-INSTALL_TEMPL :=$(INSTALL_DIR)/template
+DESTDIR   :=$(DESTDIR)
+INSTALL_BIN   :=/bin
+INSTALL_MAN   :=/man
+INSTALL_CONF  :=/etc/gogoc
+INSTALL_TEMPL :=$(INSTALL_CONF)/template
 
 
 SUBDIRS=$(PWD)/src/lib \
@@ -66 +67 @@
 LD_LIBRARIES=-lgogocpal -lgogocconfig -lgogocmessaging
 
 # Export these variables to sub-makes.
-export PLATFORM_DIR PLATFORM BIN_DIR OBJS_DIR TARGET DEBUG CC_INC_PATHS LD_LIB_PATHS LD_LIBRARIES INSTALL_DIR INSTALL_BIN INSTALL_MAN INSTALL_TEMPL
+export PLATFORM_DIR PLATFORM BIN_DIR OBJS_DIR TARGET DEBUG CC_INC_PATHS LD_LIB_PATHS LD_LIBRARIES DESTDIR INSTALL_BIN INSTALL_MAN INSTALL_TEMPL DESTDIR
 
 
 #
@@ -155 +156 @@
 # This makefile target will install the gogoCLIENT.
 #
 check-gogoc-install:
-        @[ -n "$(INSTALL_DIR)" ] || { \
+        @[ -n "$(DESTDIR)" ] || { \
             echo ; \
             echo "Error: You must specify the install directory"; \
-            echo "Syntax: make [platform=<os-type>] installdir=</path/to/install> install"; \
+            echo "Syntax: make [platform=<os-type>] DESTDIR=</path/to/install> install"; \
             echo ; \
             exit 1;\
         }
 
 install: check-gogoc-install all
-        @mkdir -p $(INSTALL_DIR)
-        @mkdir -p $(INSTALL_BIN)
-        @mkdir -p $(INSTALL_MAN)
-        @mkdir -p $(INSTALL_TEMPL)
+        @mkdir -p $(DESTDIR)
+        @mkdir -p $(DESTDIR)$(INSTALL_BIN)
+        @mkdir -p $(DESTDIR)$(INSTALL_MAN)
+        @mkdir -p $(DESTDIR)$(INSTALL_TEMPL)
+        @mkdir -p $(DESTDIR)$(INSTALL_CONF)
 
         @for dir in ${SUBDIRS}; do \
             $(MAKE) -C $$dir install || exit 1; \
         done
 
-        @cp $(TARGET) $(INSTALL_BIN)
-        @cp $(BIN_DIR)/gogoc.conf.sample $(INSTALL_BIN)
-        @[ -f $(INSTALL_BIN)/gogoc.conf ] || { \
-            cp $(INSTALL_BIN)/gogoc.conf.sample $(INSTALL_BIN)/gogoc.conf; \
+        @cp $(TARGET) $(DESTDIR)$(INSTALL_BIN)
+        @cp $(BIN_DIR)/gogoc.conf.sample $(DESTDIR)$(INSTALL_CONF)
+        @[ -f $(DESTDIR)$(INSTALL_CONF)/gogoc.conf ] || { \
+            cp $(DESTDIR)$(INSTALL_CONF)/gogoc.conf.sample $(DESTDIR)$(INSTALL_CONF)/gogoc.conf; \
         }