Fix: subproject.make

[Georg Fleischmann]

Hello,

here is a fix for the subproject.make file.
Since the framework support was added, the subproject makefile produces errors  
in some for loops with empty list.
The patch adds the same workaround used in all the other loops.

Georg


2000-12-04 Georg Fleischmann

        * Makefiles/subproject.make
        workaround for empty list in for loops added


*** Makefiles/subproject.make.old       Sun Nov 19 21:14:06 2000
--- Makefiles/subproject.make   Mon Dec  4 19:50:45 2000
***************
*** 95,122 ****
              fi; \
            done; \
          fi; \
!       fi;

  framework-components::
        @(if [ "$(FRAMEWORK_NAME)" != "" ]; then \
          if [ "$(COMPONENTS)" != "" ]; then \
            echo "Copying components into the framework wrapper..."; \
            cd $(FRAMEWORK_VERSION_DIR_NAME)/Resources; \
!           for component in $(COMPONENTS); do \
!             if [ -d ../../../../$(SUBPROJECT_ROOT_DIR)/$$component ]; then \
!               cp -r ../../../../$(SUBPROJECT_ROOT_DIR)/$$component ./; \
              fi; \
            done; \
            echo "Copying localized components into the framework wrapper..."; \
!           for l in $(LANGUAGES); do \
!             if [ ! -f $$l.lproj ]; then \
!               $(MKDIRS) $$l.lproj; \
              fi; \
              cd $$l.lproj; \
!             for f in $(COMPONENTS); do \
!               if [ -d ../../../../../$(SUBPROJECT_ROOT_DIR)/$$l.lproj/$$f ]; 
then \
!                 cp -r ../../../../../$(SUBPROJECT_ROOT_DIR)/$$l.lproj/$$f .;\
!               fi; \
              done; \
              cd ..; \
            done;\
--- 95,128 ----
              fi; \
            done; \
          fi; \
!       fi

  framework-components::
        @(if [ "$(FRAMEWORK_NAME)" != "" ]; then \
          if [ "$(COMPONENTS)" != "" ]; then \
            echo "Copying components into the framework wrapper..."; \
            cd $(FRAMEWORK_VERSION_DIR_NAME)/Resources; \
!           for component in $(COMPONENTS) __done; do \
!             if [ $$component != __done ]; then \
!               if [ -d ../../../../$(SUBPROJECT_ROOT_DIR)/$$component ]; then \
!                 cp -r ../../../../$(SUBPROJECT_ROOT_DIR)/$$component ./; \
!               fi; \
              fi; \
            done; \
            echo "Copying localized components into the framework wrapper..."; \
!           for l in $(LANGUAGES) __done; do \
!             if [ $$l != __done ]; then \
!               if [ ! -f $$l.lproj ]; then \
!                 $(MKDIRS) $$l.lproj; \
!               fi; \
              fi; \
              cd $$l.lproj; \
!             for f in $(COMPONENTS) __done; do \
!               if [ $$f != __done ]; then \
!                 if [ -d ../../../../../$(SUBPROJECT_ROOT_DIR)/$$l.lproj/$$f  
]; then \
!                   cp -r ../../../../../$(SUBPROJECT_ROOT_DIR)/$$l.lproj/$$f 
.; \
!                 fi; \
!               fi; \
              done; \
              cd ..; \
            done;\
***************
*** 138,151 ****
        @(if [ "$(FRAMEWORK_NAME)" != "" ]; then \
          if [ "$(LOCALIZED_RESOURCE_FILES)" != "" ]; then \
            echo "Copying localized resources into the framework wrapper..."; \
!           for l in $(LANGUAGES); do \
!             if [ ! -f $$l.lproj ]; then \
!               $(MKDIRS) $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$$l.lproj; \
              fi; \
!             for f in $(LOCALIZED_RESOURCE_FILES); do \
!               if [ -f $$l.lproj/$$f ]; then \
!                 cp -r $$l.lproj/$$f  
$(FRAMEWORK_VERSION_DIR_NAME)/Resources/$$l.lproj; \
!               fi; \
              done; \
            done; \
          fi; \
--- 144,161 ----
        @(if [ "$(FRAMEWORK_NAME)" != "" ]; then \
          if [ "$(LOCALIZED_RESOURCE_FILES)" != "" ]; then \
            echo "Copying localized resources into the framework wrapper..."; \
!           for l in $(LANGUAGES) __done; do \
!             if [ $$l != __done ]; then \
!               if [ ! -f $$l.lproj ]; then \
!                 $(MKDIRS) $(FRAMEWORK_VERSION_DIR_NAME)/Resources/$$l.lproj; \
!               fi; \
              fi; \
!             for f in $(LOCALIZED_RESOURCE_FILES) __done; do \
!               if [ $$f != __done ]; then \
!                 if [ -f $$l.lproj/$$f ]; then \
!                   cp -r $$l.lproj/$$f  
$(FRAMEWORK_VERSION_DIR_NAME)/Resources/$$l.lproj; \
!                 fi; \
!               fi; \
              done; \
            done; \
          fi; \
***************
*** 164,172 ****
        @(if [ "$(WEBSERVER_RESOURCE_FILES)" != "" ]; then \
          echo "Copying webserver resources into the framework wrapper..."; \
          cd $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
!         for ff in $(WEBSERVER_RESOURCE_FILES); do \
!           if [ -f ../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$ff  
]; then \
!             cp -r ../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$ff 
.; \
            fi; \
          done; \
        fi;)
--- 174,184 ----
        @(if [ "$(WEBSERVER_RESOURCE_FILES)" != "" ]; then \
          echo "Copying webserver resources into the framework wrapper..."; \
          cd $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
!         for ff in $(WEBSERVER_RESOURCE_FILES) __done; do \
!           if [ $$ff != __done ]; then \
!             if [ -f  
../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$ff ]; then \
!               cp -r 
../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$ff .; \
!             fi; \
            fi; \
          done; \
        fi;)
***************
*** 175,190 ****
        @(if [ "$(LOCALIZED_WEBSERVER_RESOURCE_FILES)" != "" ]; then \
          echo "Copying localized webserver resources into the framework  
wrapper..."; \
          cd $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
!         for l in $(LANGUAGES); do \
!           if [ ! -f $$l.lproj ]; then \
!             $(MKDIRS) $$l.lproj; \
            fi; \
            cd $$l.lproj; \
!           for f in $(LOCALIZED_WEBSERVER_RESOURCE_FILES); do \
!             if [ -f  
../../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$l.lproj/$$f ]; then  
\
!               if [ ! -r $$f ]; then \
!                 cp -r  
../../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$l.lproj/$$f $$f; \
!               fi; \
              fi;\
            done;\
            cd ..; \
--- 187,206 ----
        @(if [ "$(LOCALIZED_WEBSERVER_RESOURCE_FILES)" != "" ]; then \
          echo "Copying localized webserver resources into the framework  
wrapper..."; \
          cd $(FRAMEWORK_VERSION_DIR_NAME)/WebServerResources; \
!         for l in $(LANGUAGES) __done; do \
!           if [ $$l != __done ]; then \
!             if [ ! -f $$l.lproj ]; then \
!               $(MKDIRS) $$l.lproj; \
!             fi; \
            fi; \
            cd $$l.lproj; \
!           for f in $(LOCALIZED_WEBSERVER_RESOURCE_FILES) __done; do \
!             if [ $$f != __done ]; then \
!               if [ -f  
../../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$l.lproj/$$f ]; then  
\
!                 if [ ! -r $$f ]; then \
!                   cp -r  
../../../../../$(SUBPROJECT_ROOT_DIR)/WebServerResources/$$l.lproj/$$f $$f; \
!                 fi; \
!               fi;\
              fi;\
            done;\
            cd ..; \