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

2009-08-10 15:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source
This commit is contained in:
Viktor Szakats
2009-08-10 13:59:29 +00:00
parent e046ee2db2
commit 51118c6d90
3 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -17,6 +17,11 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-10 15:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/instsh.cf
* config/dirsh.cf
* Changed TABs to spaces in some remaining places.
2009-08-10 15:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* tests/hbpptest/Makefile
* tests/Makefile

22
harbour/config/dirsh.cf
View File

@@ -11,33 +11,30 @@ endif
ifeq ($(DIRS),) # Empty directory list
DIR_RULE =\
@echo Done
DIR_RULE := @echo Done
else
ifeq ($(HB_SHELL),sh)
DIR_RULE =\
@for d in $(DIRS); do \
if [ -d "$$d" ]; then \
$(MAKE) -C $$d $@; \
fi \
done
@for d in $(DIRS); do \
if [ -d "$$d" ]; then \
$(MAKE) -C $$d $@; \
fi \
done
endif
ifeq ($(HB_SHELL),nt)
DIR_RULE =\
for %%d in ($(DIRS_OS)) do $(MK_OS) -C %%d $@
DIR_RULE = for %%d in ($(DIRS_OS)) do $(MK_OS) -C %%d $@
endif
ifeq ($(HB_SHELL),os2)
DIR_RULE =\
for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@
DIR_RULE = for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@
endif
@@ -51,8 +48,7 @@ $(MK_OS) -C $(file) $@
endef
DIR_RULE =\
$(foreach file, $(DIRS_OS), $(dir_mk))
DIR_RULE = $(foreach file, $(DIRS_OS), $(dir_mk))
endif

49
harbour/config/instsh.cf
View File

@@ -11,47 +11,45 @@ endif
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE =\
@echo Done
INSTALL_RULE := @echo Done
else
ifeq ($(INSTALL_DIR),) # Empty install dir
INSTALL_RULE =\
@echo Done
INSTALL_RULE := @echo Done
else
ifeq ($(HB_SHELL),sh)
INSTALL_RULE =\
@$(MDP) $(subst \,/,$(INSTALL_DIR)); \
if [ ! -d "$(subst \,/,$(INSTALL_DIR))" ]; \
then \
echo "! Can't install, path not found: '$(subst \,/,$(INSTALL_DIR))'" 1>&2; \
false; \
else \
for i in $(INSTALL_FILES); \
do \
if [ -r "$$i" ]; \
then \
echo "! Installing $$i on $(subst \,/,$(INSTALL_DIR))"; \
$(CP) $$i $(subst \,/,$(INSTALL_DIR)); \
true; \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
fi
@$(MDP) $(subst \,/,$(INSTALL_DIR)); \
if [ ! -d "$(subst \,/,$(INSTALL_DIR))" ]; \
then \
echo "! Can't install, path not found: '$(subst \,/,$(INSTALL_DIR))'" 1>&2; \
false; \
else \
for i in $(INSTALL_FILES); \
do \
if [ -r "$$i" ]; \
then \
echo "! Installing $$i on $(subst \,/,$(INSTALL_DIR))"; \
$(CP) $$i $(subst \,/,$(INSTALL_DIR)); \
true; \
else \
echo "! Can't install $$i, not found" 1>&2; \
fi \
done \
fi
endif
ifeq ($(HB_SHELL),nt)
INSTALL_RULE =\
-$(CMDPREF)if not exist "$(INSTALL_DIR_OS)" $(MDP) "$(INSTALL_DIR_OS)" &\
for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
-$(CMDPREF)if not exist "$(INSTALL_DIR_OS)" $(MDP) "$(INSTALL_DIR_OS)" &\
for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(INSTALL_DIR_OS)"
endif
@@ -91,8 +89,7 @@ $(CP) $(file) $(INSTALL_DIR_OS)
endef
INSTALL_RULE =\
$(inst_file_all)
INSTALL_RULE = $(inst_file_all)
endif