6 files changed, 23 insertions, 33 deletions
diff --git a/cpp/Makefile b/cpp/Makefile
index 5b28a9047c1..b58e2fb33f6 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -13,7 +13,7 @@ include $(top_srcdir)/config/Make.rules
 
 SUBDIRS		= config src include test demo
 
-INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir)
+INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
 
 install:: install-common
 	@for subdir in $(INSTALL_SUBDIRS); \
diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak
index e1e80589e3c..64c1359664b 100644
--- a/cpp/Makefile.mak
+++ b/cpp/Makefile.mak
@@ -13,7 +13,7 @@ top_srcdir	= .
 
 SUBDIRS		= config src include test demo
 
-INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir)
+INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
 
 install:: install-common
 	@for %i in ( $(INSTALL_SUBDIRS) ) do \
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 39ff59ffa9f..a28763e134a 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -124,9 +124,6 @@ else
     include $(top_srcdir)/../config/Make.common.rules
 endif
 
-install_includedir	= $(prefix)/include
-install_docdir		= $(prefix)/doc
-
 bindir			= $(top_srcdir)/bin
 libdir			= $(top_srcdir)/lib
 
@@ -145,8 +142,11 @@ endif
 #
 include	 $(top_srcdir)/config/Make.rules.$(UNAME)
 
-install_bindir	  := $(prefix)/$(binsubdir)
-install_libdir	  := $(prefix)/$(libsubdir)
+install_includedir	:= $(prefix)/include
+install_docdir		:= $(prefix)/doc
+install_bindir	  	:= $(prefix)/$(binsubdir)
+install_libdir	  	:= $(prefix)/$(libsubdir)
+install_configdir 	:= $(prefix)/config
 
 ifneq ($(embedded_runpath_prefix),)
     runpath_libdir	:= $(embedded_runpath_prefix)/$(libsubdir)
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 7fda30abf38..e1c0e4fc99b 100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -115,7 +115,7 @@ install_bindir		= $(prefix)\bin$(x64suffix)
 install_libdir	  	= $(prefix)\lib$(x64suffix)
 install_includedir	= $(prefix)\include
 install_docdir		= $(prefix)\doc
-libsubdir	  	= lib
+install_configdir	= $(prefix)\config
 
 SETARGV			= setargv.obj
 
diff --git a/cpp/config/Makefile b/cpp/config/Makefile
index 41311e5d13d..c67e7b37cf2 100644
--- a/cpp/config/Makefile
+++ b/cpp/config/Makefile
@@ -15,15 +15,10 @@ all::
 	echo ""
 
 install::
-	@if test ! -d $(prefix)/config ; \
-	then \
-	    echo "Creating $(prefix)/config..." ; \
-	    $(call mkdir,$(prefix)/config) ; \
-	fi
-	$(call installdata,templates.xml,$(prefix)/config)
-	$(call installdata,convertssl.py,$(prefix)/config)
-	$(call installdata,upgradeicegrid.py,$(prefix)/config)
-	$(call installdata,icegrid-slice.3.1.ice.gz,$(prefix)/config)
-	$(call installdata,icegrid-slice.3.2.ice.gz,$(prefix)/config)
-	$(call installdata,icegrid-slice.3.3.ice.gz,$(prefix)/config)
+	$(call installdata,templates.xml,$(install_configdir))
+	$(call installdata,convertssl.py,$(install_configdir))
+	$(call installdata,upgradeicegrid.py,$(install_configdir))
+	$(call installdata,icegrid-slice.3.1.ice.gz,$(install_configdir))
+	$(call installdata,icegrid-slice.3.2.ice.gz,$(install_configdir))
+	$(call installdata,icegrid-slice.3.3.ice.gz,$(install_configdir))
 
diff --git a/cpp/config/Makefile.mak b/cpp/config/Makefile.mak
index f6d669577b5..589ef4ccc36 100644
--- a/cpp/config/Makefile.mak
+++ b/cpp/config/Makefile.mak
@@ -12,17 +12,12 @@ top_srcdir	= ..
 !include $(top_srcdir)/config/Make.rules.mak
 
 install::
-	@if not exist $(prefix)\config \
-	    @echo "Creating $(prefix)\config..." && \
-	    mkdir $(prefix)\config
-	copy Make.rules.mak $(prefix)\config
-	copy Make.rules.bcc $(prefix)\config
-	copy templates.xml $(prefix)\config
-	copy convertssl.py $(prefix)\config
-	copy upgradeicegrid.py $(prefix)\config
-	copy icegridregistry.cfg $(prefix)\config
-	copy icegridnode.cfg $(prefix)\config
-	copy glacier2router.cfg $(prefix)\config
-	copy icegrid-slice.3.1.ice.gz $(prefix)\config
-	copy icegrid-slice.3.2.ice.gz $(prefix)\config
-	copy icegrid-slice.3.3.ice.gz $(prefix)\config
+	copy templates.xml $(install_configdir)
+	copy convertssl.py $(install_configdir)
+	copy upgradeicegrid.py $(install_configdir)
+	copy icegridregistry.cfg $(install_configdir)
+	copy icegridnode.cfg $(install_configdir)
+	copy glacier2router.cfg $(install_configdir)
+	copy icegrid-slice.3.1.ice.gz $(install_configdir)
+	copy icegrid-slice.3.2.ice.gz $(install_configdir)
+	copy icegrid-slice.3.3.ice.gz $(install_configdir)