Include all of $(SHARE)/config/CONFIG_APP if SHARE is defined.

This commit is contained in:
Marty Kraimer
1997-06-05 18:53:56 +00:00
parent db49a2babb
commit 423e24fe8b
2 changed files with 12 additions and 14 deletions

View File

@@ -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

View File

@@ -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";