From 423e24fe8b0537f2e66bbdad7398f495c4cee18e Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Thu, 5 Jun 1997 18:53:56 +0000
Subject: [PATCH] Include all of $(SHARE)/config/CONFIG_APP if SHARE is
 defined.

---
 src/tools/makeBaseApp    | 12 ++++++------
 src/tools/makeBaseApp.pl | 14 ++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/tools/makeBaseApp b/src/tools/makeBaseApp
index 3ebb63514..6179e6bb5 100755
--- a/src/tools/makeBaseApp
+++ b/src/tools/makeBaseApp
@@ -67,19 +67,19 @@ if [ ! -d config ]; then
 	cat > config/CONFIG_APP <<-\END
 		#CONFIG_APP DO NOT EDIT THIS FILE
 		include $(TOP)/config/RELEASE
+		ifdef SHARE
+		include $(SHARE)/config/CONFIG_APP
+		else
 		ifndef T_A
 		T_A = $(HOST_ARCH)
-		endif
+		endif #ifndef T_A
 		include $(EPICS_BASE)/config/CONFIG
-		ifdef SHARE
-		USR_INCLUDES += -I$(SHARE)/include
-		SHARE_BIN = $(SHARE)/bin/$(T_A)
-		endif
 		ifdef MASTER_IOCAPPS
 		USR_INCLUDES += -I$(MASTER_IOCAPPS)/include
 		MASTER_IOCAPPS_BIN = $(MASTER_IOCAPPS)/bin/$(T_A)
-		endif
+		endif #ifdef MASTER_IOCAPPS
 		include $(TOP)/config/CONFIG
+		endif #ifdef SHARE
 	END
 	cat > config/RELEASE <<-END
 		#RELEASE Location of external products
diff --git a/src/tools/makeBaseApp.pl b/src/tools/makeBaseApp.pl
index 40eb1bdd6..fe43f7f7f 100644
--- a/src/tools/makeBaseApp.pl
+++ b/src/tools/makeBaseApp.pl
@@ -82,21 +82,19 @@ unless (-d 'config')
 	open OUT, ">CONFIG_APP" or die "Cannot create CONFIG_APP";
 	print OUT "#\tCONFIG_APP DO NOT EDIT THIS FILE\n";
 	print OUT "include \$(TOP)/config/RELEASE\n";
+	print OUT "ifdef SHARE\n";
+	print OUT "include $(SHARE)/config/CONFIG_APP\n";
+	print OUT "else\n";
 	print OUT "ifndef T_A\n";
 	print OUT "T_A = \$(HOST_ARCH)\n";
-	print OUT "endif\n";
+	print OUT "endif #ifndef T_A\n";
 	print OUT "include \$(EPICS_BASE)/config/CONFIG\n";
-
-	print OUT "ifdef SHARE\n";
-	print OUT "USR_INCLUDES += -I\$(SHARE)/include\n";
-	print OUT "SHARE_BIN = \$(SHARE)/bin/\$(T_A)\n";
-	print OUT "endif\n";
-
 	print OUT "ifdef MASTER_IOCAPPS\n";
 	print OUT "USR_INCLUDES += -I\$(MASTER_IOCAPPS)/include\n";
 	print OUT "MASTER_IOCAPPS_BIN = \$(MASTER_IOCAPPS)/bin/\$(T_A)\n";
-	print OUT "endif\n";
+	print OUT "endif #ifdef MASTER_IOCAPPS\n";
 	print OUT "include \$(TOP)/config/CONFIG\n";
+	print OUT "endif #ifdef SHARE\n";
 	close OUT;
 
 	open OUT, ">RELEASE" or die "Cannot create RELEASE";