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

2009-07-15 12:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/darwin/install.cf
  * config/hpux/install.cf
  * config/dos/install.cf
  * config/install.cf
  * config/win/install.cf
  * config/linux/install.cf
  * config/os2/install.cf
  * config/sunos/install.cf
  * config/bsd/install.cf
  * config/wce/install.cf
    * Little tweak to install rules to allow multiline rules
      on non-bash shells.
      Maybe there is another way, but couldn't find it.
    ; This is a step towards moving install dir creation to
      GNU Make level.
This commit is contained in:
Viktor Szakats
2009-07-15 10:27:40 +00:00
parent 2a935acc52
commit b3ed7c67f0
11 changed files with 125 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -17,6 +17,23 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-15 12:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/darwin/install.cf
* config/hpux/install.cf
* config/dos/install.cf
* config/install.cf
* config/win/install.cf
* config/linux/install.cf
* config/os2/install.cf
* config/sunos/install.cf
* config/bsd/install.cf
* config/wce/install.cf
* Little tweak to install rules to allow multiline rules
on non-bash shells.
Maybe there is another way, but couldn't find it.
; This is a step towards moving install dir creation to
GNU Make level.
2009-07-15 11:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/hbinet.c
* Formatting, cleanup.

24
harbour/config/bsd/install.cf
View File

@@ -2,19 +2,19 @@
# $Id$
#
INSTALL_RULE =\
install:: first
@if [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
else \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
fi

34
harbour/config/darwin/install.cf
View File

@@ -2,24 +2,24 @@
# $Id$
#
INSTALL_RULE =\
install:: first
@if [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
else \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
true; \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done; \
if [ $(INSTALL_DIR) = $(HB_LIB_INSTALL) ]; \
then \
$(RANLIB) $(foreach file,$(notdir $(INSTALL_FILES)),$(INSTALL_DIR)/$(file)); \
fi \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
true; \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done; \
if [ $(INSTALL_DIR) = $(HB_LIB_INSTALL) ]; \
then \
$(RANLIB) $(foreach file,$(notdir $(INSTALL_FILES)),$(INSTALL_DIR)/$(file)); \
fi \
fi

10
harbour/config/dos/install.cf
View File

@@ -4,7 +4,8 @@
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
install:: first
@echo Done
else
@@ -20,13 +21,16 @@ endef
INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
install:: first
$(foreach file, $(INSTALL_FILES_OS), $(inst_file))
else # bash
INSTALL_DIR_OS = $(subst \,/,$(INSTALL_DIR))
INSTALL_FILES_OS = $(subst \,/,$(INSTALL_FILES))
INSTALL_RULE =\
install:: first
@sh -c 'if [ ! -d $(INSTALL_DIR_OS) ]; \
then \
echo "! Cannot install, path not found: $(INSTALL_DIR_OS)" 1>&2; \

24
harbour/config/hpux/install.cf
View File

@@ -2,19 +2,19 @@
# $Id$
#
INSTALL_RULE =\
install:: first
@if [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
else \
for i in $(INSTALL_OBJS); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
fi

3
harbour/config/install.cf
View File

@@ -6,7 +6,4 @@ ifneq ($(HB_INSTALL_DEF),yes)
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/install.cf
install:: first
$(INSTALL_RULE)
endif

11
harbour/config/linux/install.cf
View File

@@ -4,7 +4,8 @@
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
install:: first
@echo Done
else
@@ -15,7 +16,7 @@ ifeq ($(OS2_SHELL),) # non-OS/2
INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = \
install:: first
-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
else # OS/2
@@ -29,13 +30,15 @@ $(COMSPEC) /C $(CP) $(file) $(subst /,\,$(INSTALL_DIR))
endef
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
install:: first
$(foreach file, $(INSTALL_FILES_OS), $(inst_file))
endif
else # bash
INSTALL_RULE =\
install:: first
@if [ -z $(INSTALL_DIR) ] || [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \

11
harbour/config/os2/install.cf
View File

@@ -4,7 +4,8 @@
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
install:: first
@echo Done
else
@@ -15,7 +16,7 @@ ifeq ($(OS2_SHELL),) # non-OS/2
INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = \
install:: first
-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
else # OS/2
@@ -29,13 +30,15 @@ $(COMSPEC) /C $(CP) $(file) $(subst /,\,$(INSTALL_DIR))
endef
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
install:: first
$(foreach file, $(INSTALL_FILES_OS), $(inst_file))
endif
else # bash
INSTALL_RULE =\
install:: first
@if [ -z $(INSTALL_DIR) ] || [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \

24
harbour/config/sunos/install.cf
View File

@@ -2,19 +2,19 @@
# $Id$
#
INSTALL_RULE =\
install:: first
@if [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
else \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
fi

33
harbour/config/wce/install.cf
View File

@@ -4,7 +4,8 @@
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
install:: first
@echo Done
else
@@ -13,28 +14,28 @@ ifeq ($(SHLVL),) # non-bash
INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = \
install:: first
-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
else # bash
INSTALL_RULE =\
install:: first
@if [ -z $(INSTALL_DIR) ] || [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
false; \
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
false; \
else \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
true; \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
true; \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
fi
endif

33
harbour/config/win/install.cf
View File

@@ -4,7 +4,8 @@
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
install:: first
@echo Done
else
@@ -13,28 +14,28 @@ ifeq ($(SHLVL),) # non-bash
INSTALL_DIR_OS = $(subst /,\,$(INSTALL_DIR))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = \
install:: first
-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
else # bash
INSTALL_RULE =\
install:: first
@if [ -z $(INSTALL_DIR) ] || [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
false; \
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
false; \
else \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
true; \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIR)"; \
$(CP) $$i $(INSTALL_DIR); \
true; \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
fi
endif