Browse Source

* Make the difference between installation paths between unices and others in the rules section. The prerules are evaluated too early

git-svn-id: trunk@17376 -
joost 14 years ago
parent
commit
c30ba507cd
1 changed files with 6 additions and 6 deletions
  1. 6 6
      packages/fcl-web/Makefile.fpm

+ 6 - 6
packages/fcl-web/Makefile.fpm

@@ -30,11 +30,6 @@ ifdef CPU_TARGET
 FPC_TARGETOPT+=--cpu=$(CPU_TARGET)
 endif
 LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT)
-ifdef UNIXHier
-PREFIXFPMAKE=$(INSTALL_PREFIX)
-else
-PREFIXFPMAKE=$(INSTALL_BASEDIR)
-endif
 
 [rules]
 fpmake: fpmake.pp
@@ -50,7 +45,12 @@ debug:	fpmake
 clean:	
 	$(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
 install:	fpmake
-	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(PREFIXFPMAKE)
+ifdef UNIXHier
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX)
+else
+	$(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR)
+endif
+
 # Normally distinstall also installs the examples, but in this case there are
 # none.
 distinstall:	install