Browse Source

* fixed examples dir for linux

olle 21 years ago
parent
commit
19f8e5ff4c
2 changed files with 175 additions and 186 deletions
  1. 169 174
      utils/fpcm/fpcmake.inc
  2. 6 12
      utils/fpcm/fpcmake.ini

File diff suppressed because it is too large
+ 169 - 174
utils/fpcm/fpcmake.inc


+ 6 - 12
utils/fpcm/fpcmake.ini

@@ -167,6 +167,9 @@ unexport CHECKDEPEND ALLDEPENDENCIES
 # FPC Target Detection
 # FPC Target Detection
 #####################################################################
 #####################################################################
 
 
+# Some defines
+BSDTARGETS=freebsd netbsd openbsd darwin
+
 # Fall back to default values if needed
 # Fall back to default values if needed
 ifndef CPU_TARGET
 ifndef CPU_TARGET
 ifdef CPU_TARGET_DEFAULT
 ifdef CPU_TARGET_DEFAULT
@@ -220,16 +223,7 @@ endif
 
 
 
 
 # Detect BSD, since BSD uses a slightly different directory hierarchy.
 # Detect BSD, since BSD uses a slightly different directory hierarchy.
-ifeq ($(OS_TARGET),freebsd)
-BSDhier=1
-endif
-ifeq ($(OS_TARGET),netbsd)
-BSDhier=1
-endif
-ifeq ($(OS_TARGET),openbsd)
-BSDhier=1
-endif
-ifeq ($(OS_TARGET),darwin)
+ifneq ($(findstring $(OS_TARGET),$(BSDTARGETS)),)
 BSDhier=1
 BSDhier=1
 endif
 endif
 
 
@@ -612,7 +606,7 @@ ifdef BSDhier
 INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
 else
 ifdef linuxHier
 ifdef linuxHier
-INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
+INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
 else
 else
 INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
 INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
 endif
 endif
@@ -624,7 +618,7 @@ ifdef BSDhier
 INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
 INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
 else
 else
 ifdef linuxHier
 ifdef linuxHier
-INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
 else
 else
 INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
 INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
 endif
 endif

Some files were not shown because too many files changed in this diff