diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2012-01-01 13:39:02 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2012-01-01 13:39:02 +0000 |
| commit | 37e0e18f358222ac9acf2c4921b6b74a60ef680c (patch) | |
| tree | 57ec24e99c585b641da5f1f8da022c49a8d2ae22 /packages/fcl-async | |
| parent | c82791365732ec7d9fa8ccaec0304de1b7267c39 (diff) | |
| download | fpc-37e0e18f358222ac9acf2c4921b6b74a60ef680c.tar.gz | |
* Take INSTALL_BASEDIR also into account on make distinstall
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@19939 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-async')
| -rw-r--r-- | packages/fcl-async/Makefile | 4 | ||||
| -rw-r--r-- | packages/fcl-async/Makefile.fpc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/fcl-async/Makefile b/packages/fcl-async/Makefile index 25b68055b7..b55dc605a4 100644 --- a/packages/fcl-async/Makefile +++ b/packages/fcl-async/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/31] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -2099,7 +2099,7 @@ else endif distinstall: fpmake ifdef UNIXHier - $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --unitinstalldir=$(INSTALL_UNITDIR) -ie + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie else $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie endif diff --git a/packages/fcl-async/Makefile.fpc b/packages/fcl-async/Makefile.fpc index cde44f56e4..85a368c051 100644 --- a/packages/fcl-async/Makefile.fpc +++ b/packages/fcl-async/Makefile.fpc @@ -69,7 +69,7 @@ endif # distinstall also installs the example-sources distinstall: fpmake ifdef UNIXHier - $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --unitinstalldir=$(INSTALL_UNITDIR) -ie + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie else $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie endif |