epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Use perl tools from config/tools directory instead of bin directory.

Browse Source
This commit is contained in:
Janet B. Anderson
2004-04-09 14:11:17 +00:00
parent 3068262901
commit 3f290c6c9e
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/CONFIG_COMMON
View File

@@ -42,6 +42,7 @@ INSTALL_CONFIG = $(INSTALL_LOCATION)/config
INSTALL_JAVA = $(INSTALL_LOCATION)/javalib
EPICS_BASE_INCLUDE = $(EPICS_BASE)/include
EPICS_BASE_TOOLS = $(EPICS_BASE)/config/tools
DIVIDER = .
OBJ = .
@@ -63,7 +64,7 @@ LEX = $(ELEX)
PERL=perl
# install from EPICS
INSTALL = $(PERL) $(EPICS_BASE_HOST_BIN)/installEpics.pl
INSTALL = $(PERL) $(EPICS_BASE_TOOLS)/installEpics.pl
INSTALL_PRODUCT = $(INSTALL)
INSTALL_LIBRARY = $(INSTALL)

12
config/CONFIG_HOST_ARCH.Borland
View File

@@ -13,12 +13,12 @@
EXE=.exe
HOSTEXE=.exe
CP =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
MV =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
RM =$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -f
MKDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/mkdir.pl
RMDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -rf
FN =$(PERL) $(EPICS_BASE_HOST_BIN)/fullName.pl
CP =$(PERL) $(EPICS_BASE_TOOLS)/cp.pl
MV =$(PERL) $(EPICS_BASE_TOOLS)/mv.pl
RM =$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -f
MKDIR=$(PERL) $(EPICS_BASE_TOOLS)/mkdir.pl
RMDIR=$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -rf
FN =$(PERL) $(EPICS_BASE_TOOLS)/fullName.pl
CHMOD=echo
ECHO=echo

10
config/CONFIG_HOST_ARCH.WIN32
View File

@@ -13,11 +13,11 @@
EXE=.exe
HOSTEXE=.exe
CP =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
MV =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
RM =$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -f
MKDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/mkdir.pl
RMDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -rf
CP =$(PERL) $(EPICS_BASE_TOOLS)/cp.pl
MV =$(PERL) $(EPICS_BASE_TOOLS)/mv.pl
RM =$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -f
MKDIR=$(PERL) $(EPICS_BASE_TOOLS)/mkdir.pl
RMDIR=$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -rf
CHMOD=echo
ECHO=echo

4
config/RULES.Vx
View File

@@ -129,7 +129,7 @@ endif
%.out : %.o
@ $(RM) ctct.o ctdt.c nm.out
$(NM) $< > nm.out
$(PERL) $(EPICS_BASE)/bin/$(HOST_ARCH)/munch.pl < nm.out > ctdt.c
$(PERL) $(EPICS_BASE_TOOLS)/munch.pl < nm.out > ctdt.c
$(COMPILE.c) -traditional ctdt.c
$(LINK.cc) $@ $< ctdt.o
@@ -137,7 +137,7 @@ endif
$(MUNCHNAME):%.munch : %
@ $(RM) ctct.o ctdt.c nm.out
$(NM) $< > nm.out
$(PERL) $(EPICS_BASE)/bin/$(HOST_ARCH)/munch.pl < nm.out > ctdt.c
$(PERL) $(EPICS_BASE_TOOLS)/munch.pl < nm.out > ctdt.c
$(COMPILE.c) -traditional ctdt.c
$(LINK.cc) $@ $(LDFLAGS) $< ctdt.o

8
config/RULES_ARCHS
View File

@@ -60,11 +60,11 @@ $(crossActionArchTargets) :
$(crossArchs) :
endif
$(hostDirs) :
$(PERL) $(EPICS_BASE_HOST_BIN)/makeMakefile.pl $@ Host
$(hostDirs) : $(EPICS_BASE_TOOLS)/makeMakefile.pl
$(PERL) $(EPICS_BASE_TOOLS)/makeMakefile.pl $@ Host
$(crossDirs) :
$(PERL) $(EPICS_BASE_HOST_BIN)/makeMakefile.pl $@ Vx
$(crossDirs) : $(EPICS_BASE_TOOLS)/makeMakefile.pl
$(PERL) $(EPICS_BASE_TOOLS)/makeMakefile.pl $@ Vx
#
# host/cross action targets