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

* config/hpux/install.cf
  * config/darwin/install.cf
  * config/dos/install.cf
  * config/win/install.cf
  * config/install.cf
  * config/linux/install.cf
  * config/os2/install.cf
  * config/sunos/install.cf
  * config/bsd/install.cf
  * config/wce/install.cf
    ! Restored previous install rule setup, to fix hbpp combined
      lib/bin install case.
    ; QUESTION: How to use multiple commands in a non-bash (= batch)
                INSTALL_RULE variable? This would be needed to support
                automatic addition of install dirs with non-bash shells.
This commit is contained in:
Viktor Szakats
2009-07-15 12:02:59 +00:00
parent d3fd9484c7
commit f6bfa2149e
11 changed files with 41 additions and 23 deletions

View File

@@ -17,6 +17,23 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-15 14:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/hpux/install.cf
* config/darwin/install.cf
* config/dos/install.cf
* config/win/install.cf
* config/install.cf
* config/linux/install.cf
* config/os2/install.cf
* config/sunos/install.cf
* config/bsd/install.cf
* config/wce/install.cf
! Restored previous install rule setup, to fix hbpp combined
lib/bin install case.
; QUESTION: How to use multiple commands in a non-bash (= batch)
INSTALL_RULE variable? This would be needed to support
automatic addition of install dirs with non-bash shells.
2009-07-15 13:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/win/bcc.cf
+ Restored bash rules for bcc.

View File

@@ -2,7 +2,7 @@
# $Id$
#
install:: first
INSTALL_RULE =\
@if [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \

View File

@@ -2,7 +2,7 @@
# $Id$
#
install:: first
INSTALL_RULE =\
@if [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \

View File

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

View File

@@ -2,7 +2,7 @@
# $Id$
#
install:: first
INSTALL_RULE =\
@if [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \

View File

@@ -2,8 +2,9 @@
# $Id$
#
ifneq ($(HB_INSTALL_DEF),yes)
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/install.cf
ifneq ($(HB_INSTALL_DEF),yes)
install:: first
$(INSTALL_RULE)
endif

View File

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

View File

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

View File

@@ -2,7 +2,7 @@
# $Id$
#
install:: first
INSTALL_RULE =\
@if [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \

View File

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

View File

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