fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-09-20 15:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/global.mk
    * Changed to install libs by default to lib/<plat>/<comp> on *nixes too.
      (if HB_INSTALL_PREFIX isn't a system location)

  * config/dyn.mk
    ! Typo in prev.
This commit is contained in:
Viktor Szakats
2009-09-20 13:16:04 +00:00
parent 5dc8ba8ca3
commit ba63822d51
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-20 15:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
* Changed to install libs by default to lib/<plat>/<comp> on *nixes too.
(if HB_INSTALL_PREFIX isn't a system location)
* config/dyn.mk
! Typo in prev.
2009-09-20 14:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* bin/postinst.sh
! Fix to strip command. Now using 'find' again and using -maxdepth 1

2
harbour/config/dyn.mk
View File

@@ -56,7 +56,7 @@ ifneq ($(DY_RULE),)
DYN_NAME := $(DYN_PREF)$(DYNNAME)$(DYN_EXT)
DYN_FILE := $(DYN_DIR)/$(DYN_NAME)
DYN_NAME2 := $(DYN_PREF)$(DYNNAME2)$(DYN_EXT)
DYN_FILE2 := $(DYN_DIR)/$(DYNNAME2)
DYN_FILE2 := $(DYN_DIR)/$(DYN_NAME2)
ifneq ($(IMP_DIR),)
IMP_NAME := $(LIB_PREF)$(DYNNAME)$(LIB_EXT)

19
harbour/config/global.mk
View File

@@ -1234,22 +1234,25 @@ ifneq ($(HB_INSTALL_PREFIX),)
else ifeq ($(HB_PLATFORM_UNIX),)
LIBPOSTFIX := $(DIRSEP)$(subst /,$(DIRSEP),$(PLAT_COMP))
else
LIBPOSTFIX :=
# Use 'lib64' instead of 'lib' for 64-bit targets where lib64 dir exists
ifneq ($(wildcard $(HB_INSTALL_PREFIX)$(DIRSEP)lib64),)
ifneq ($(filter $(HB_CPU),x86_64),)
LIBPOSTFIX := 64
endif
endif
# Not perfect, please enhance it.
ifneq ($(findstring |/usr,|$(HB_INSTALL_PREFIX)),)
ifeq ($(findstring |/usr/home,|$(HB_INSTALL_PREFIX)),)
LIBPOSTFIX := $(DIRSEP)harbour
LIBPOSTFIX := $(LIBPOSTFIX)$(DIRSEP)harbour
INCPOSTFIX := $(DIRSEP)harbour
endif
else
ifneq ($(findstring |/opt,|$(HB_INSTALL_PREFIX)),)
LIBPOSTFIX := $(DIRSEP)harbour
LIBPOSTFIX := $(LIBPOSTFIX)$(DIRSEP)harbour
INCPOSTFIX := $(DIRSEP)harbour
endif
endif
# Use 'lib64' instead of 'lib' for 64-bit targets where lib64 dir exists
ifneq ($(wildcard $(HB_INSTALL_PREFIX)$(DIRSEP)lib64),)
ifneq ($(filter $(HB_CPU),x86_64),)
LIBPOSTFIX := 64$(LIBPOSTFIX)
else
LIBPOSTFIX := $(DIRSEP)$(subst /,$(DIRSEP),$(PLAT_COMP))
endif
endif
endif