Browse Source

* use UNIXHier

peter 21 years ago
parent
commit
d9e0521b8d
4 changed files with 8 additions and 8 deletions
  1. 3 3
      compiler/Makefile
  2. 3 3
      compiler/Makefile.fpc
  3. 1 1
      utils/tply/Makefile
  4. 1 1
      utils/tply/Makefile.fpc

+ 3 - 3
compiler/Makefile

@@ -1914,7 +1914,7 @@ htmldocs:
 .PHONY: quickinstall install installsym
 MSGINSTALLDIR=$(INSTALL_BASEDIR)/msg
 override PPEXEFILE:=$(wildcard $(EXENAME))
-ifdef UNIXINSTALLDIR
+ifdef UNIXHier
 ifdef CROSSCOMPILE
 PPCCPULOCATION= $(INSTALL_BINDIR)
 PPCCROSSLOCATION=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)
@@ -1944,14 +1944,14 @@ ifdef CROSSCOMPILE
 endif
 endif
 install: quickinstall
-ifdef UNIXINSTALLDIR
+ifdef UNIXHier
 	$(MKDIR) $(INSTALL_BASEDIR)
 	$(INSTALLEXE) $(COMPILERUTILSDIR)/samplecfg $(INSTALL_BASEDIR)/samplecfg
 endif
 	$(MKDIR) $(MSGINSTALLDIR)
 	$(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
 installsymlink: install
-ifdef UNIXINSTALLDIR
+ifdef UNIXHier
 	$(MKDIR) $(INSTALL_BINDIR)
 	ln -sf $(INSTALL_BASEDIR)/$(EXENAME) $(INSTALL_BINDIR)/$(EXENAME)
 endif

+ 3 - 3
compiler/Makefile.fpc

@@ -534,7 +534,7 @@ htmldocs:
 MSGINSTALLDIR=$(INSTALL_BASEDIR)/msg
 override PPEXEFILE:=$(wildcard $(EXENAME))
 
-ifdef UNIXINSTALLDIR
+ifdef UNIXHier
 ifdef CROSSCOMPILE
 PPCCPULOCATION= $(INSTALL_BINDIR)
 PPCCROSSLOCATION=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)
@@ -568,7 +568,7 @@ endif
 endif
 
 install: quickinstall
-ifdef UNIXINSTALLDIR
+ifdef UNIXHier
         $(MKDIR) $(INSTALL_BASEDIR)
         $(INSTALLEXE) $(COMPILERUTILSDIR)/samplecfg $(INSTALL_BASEDIR)/samplecfg
 endif
@@ -578,7 +578,7 @@ endif
 # This also installs a link from bin to the actual executable.
 # The .deb does that later.
 installsymlink: install
-ifdef UNIXINSTALLDIR
+ifdef UNIXHier
         $(MKDIR) $(INSTALL_BINDIR)
         ln -sf $(INSTALL_BASEDIR)/$(EXENAME) $(INSTALL_BINDIR)/$(EXENAME)
 endif

+ 1 - 1
utils/tply/Makefile

@@ -1535,7 +1535,7 @@ plex$(EXEEXT): plex.pas $(wildcard lex*.pas)
 	$(COMPILER) plex.pas
 lexlib$(PPUEXT): lexlib.pas
 yacclib$(PPUEXT): yacclib.pas
-ifdef UNIXINSTALLDIR
+ifdef UNIXHier
 CODPATH=$(INSTALL_PREFIX)/lib/fpc/lexyacc
 else
 CODPATH=$(INSTALL_BINDIR)

+ 1 - 1
utils/tply/Makefile.fpc

@@ -31,7 +31,7 @@ lexlib$(PPUEXT): lexlib.pas
 
 yacclib$(PPUEXT): yacclib.pas
 
-ifdef UNIXINSTALLDIR
+ifdef UNIXHier
 CODPATH=$(INSTALL_PREFIX)/lib/fpc/lexyacc
 else
 CODPATH=$(INSTALL_BINDIR)