From Robert Swain, compile fix for debian unstable.

2006-03-02 15:26:12 +00:00
parent 507fb0074f
commit c42e14dd1f
6 changed files with 268 additions and 268 deletions
--- a/Make/instrules
+++ b/Make/instrules
@@ -11,65 +11,65 @@ __instbin:
 		INSTALL?="$(INSTBINCMD)" __install
 	@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH) INSTDEST=$(INST_LIBS) \
 		INSTALL?="$(INSTBINCMD)" __install
-	@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_PLUGINS)\
+	@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_PLUGINS) \
 		INSTALL?="$(INSTBINCMD)" __install
 ifdef IMP_LIB_EXT
-	@$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_EXAMPLES)/osgPlugins\
+	@$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_EXAMPLES)/osgPlugins \
 		INSTALL?="$(INSTBINCMD)" __install
 endif
 	@echo  >> $(INSTLOGFILE)
-	@echo "    Run-time environment installation successful.  Add "\
+	@echo "    Run-time environment installation successful.  Add " \
 	  >> $(INSTLOGFILE)
-	@echo "        $(INST_EXAMPLES)"\
+	@echo "        $(INST_EXAMPLES)" \
 	  >> $(INSTLOGFILE)
-	@echo "    to your PATH environmental variable, and"\
+	@echo "    to your PATH environmental variable, and" \
 	  >> $(INSTLOGFILE)
-	@echo "        $(INST_LIBS) and $(INST_PLUGINS)"\
+	@echo "        $(INST_LIBS) and $(INST_PLUGINS)" \
 	  >> $(INSTLOGFILE)
-	@echo "    to your LD_LIBRARY_PATH if not already present."\
+	@echo "    to your LD_LIBRARY_PATH if not already present." \
 	  >> $(INSTLOGFILE)
 	@echo >> $(INSTLOGFILE)

 __instdev:
 	@for d in `ls -1  $(TOPDIR)/include/ | grep -v CVS`; \
-	do\
+	do \
 	  if [ -d $(TOPDIR)/include/$$d ]; \
 	  then \
-	    $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
-		   INSTALL?="$(INSTDEVCMD)" __install;\
-	  fi\
+	    $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d \
+		   INSTALL?="$(INSTDEVCMD)" __install; \
+	  fi \
 	done
 	@$(TOPDIR)/Make/instexamplesrc \
-		$(TOPDIR)\
-		$(INST_LIBS)\
-		$(INST_INCLUDE)\
-		$(INST_SRC)\
-		$(INST_EXAMPLE_SRC)\
-		"$(INSTDEVCMD)"\
-		"$(C++)"\
-		"$(OPTF)"\
-		"$(DEPARG)"\
-		"$(LINKARGS)"\
-		"$(OSG_LIBS)"\
-		"$(FREETYPE_LIB)"\
-		"$(GLUT_LIB)"\
-		"$(GL_LIBS)"\
-		"$(X_LIBS)"\
-		"$(SOCKET_LIBS)"\
-		"$(OTHER_LIBS)"\
-		"$(TIFF_LIB)"\
+		$(TOPDIR) \
+		$(INST_LIBS) \
+		$(INST_INCLUDE) \
+		$(INST_SRC) \
+		$(INST_EXAMPLE_SRC) \
+		"$(INSTDEVCMD)" \
+		"$(C++)" \
+		"$(OPTF)" \
+		"$(DEPARG)" \
+		"$(LINKARGS)" \
+		"$(OSG_LIBS)" \
+		"$(FREETYPE_LIB)" \
+		"$(GLUT_LIB)" \
+		"$(GL_LIBS)" \
+		"$(X_LIBS)" \
+		"$(SOCKET_LIBS)" \
+		"$(OTHER_LIBS)" \
+		"$(TIFF_LIB)" \
        $(MAKE)


-	@echo\
+	@echo \
 	  >> $(INSTLOGFILE)
-	@echo "    Development environment installation successful.  Add"\
+	@echo "    Development environment installation successful.  Add" \
 	  >> $(INSTLOGFILE)
-	@echo "        -I$(INST_INCLUDE)"\
+	@echo "        -I$(INST_INCLUDE)" \
 	  >> $(INSTLOGFILE)
-	@echo "    compile flag when compiling with OSG header files."\
+	@echo "    compile flag when compiling with OSG header files." \
 	  >> $(INSTLOGFILE)
-	@echo "    Example programs can be found at $(INST_EXAMPLE_SRC)."\
+	@echo "    Example programs can be found at $(INST_EXAMPLE_SRC)." \
 	  >> $(INSTLOGFILE)
 	@echo  >> $(INSTLOGFILE)

@@ -97,25 +97,25 @@ instcleanbin :
 		INSTALL?="$(INSTBINCMD)" __instclean
 	@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH) INSTDEST=$(INST_LIBS) \
 		INSTALL?="$(INSTBINCMD)" __instclean
-	@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_PLUGINS)\
+	@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_PLUGINS) \
 		INSTALL?="$(INSTBINCMD)" __instclean

 instcleandev :
 	@for d in `ls -1  $(TOPDIR)/include/ | grep -v CVS`; \
-	do\
+	do \
 	  if [ -d $(TOPDIR)/include/$$d ]; \
 	  then \
-	    $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
-		   INSTALL?="$(INSTDEVCMD)" __instclean;\
-	  fi\
+	    $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d \
+		   INSTALL?="$(INSTDEVCMD)" __instclean; \
+	  fi \
 	done
 	@for d in `ls -1  $(TOPDIR)/examples | grep -v CVS`; \
-	do\
+	do \
 	  if [ -d $(TOPDIR)/examples/$$d ]; \
 	  then \
-	    $(MAKE) INSTSRC=$(TOPDIR)/examples/$$d INSTDEST=$(INST_EXAMPLE_SRC)/$$d\
-		   INSTALL?="$(INSTDEVCMD)" __instclean;\
-	  fi\
+	    $(MAKE) INSTSRC=$(TOPDIR)/examples/$$d INSTDEST=$(INST_EXAMPLE_SRC)/$$d \
+		   INSTALL?="$(INSTDEVCMD)" __instclean; \
+	  fi \
 	done

 __install :
@@ -124,17 +124,17 @@ __install :
 	@[ -n "$(INSTDEST)" ] || echo "Internal error (INSTDEST definition)"
 	@[ -n "$(INSTDEST)" ] && echo > /dev/null
 	@[ -d $(INSTDEST) ] || mkdir -p $(INSTDEST)
-	@cd $(INSTSRC);\
-	THISDIR=`pwd`;\
-	if [ -n "`ls -1 | grep -v CVS`" ]; then\
+	@cd $(INSTSRC); \
+	THISDIR=`pwd`; \
+	if [ -n "`ls -1 | grep -v CVS`" ]; then \
 	  for f in `ls -1 | grep -v CVS`; \
-	  do\
+	  do \
 	    if [ -f $$f ] ; \
 	    then \
 	        INSTPATH=$$THISDIR/$$f; \
-	        $(INSTALL) "$$INSTPATH" "$(INSTDEST)/$$f";\
-	    fi\
-	  done\
+	        $(INSTALL) "$$INSTPATH" "$(INSTDEST)/$$f"; \
+	    fi \
+	  done \
 	fi

 __instclean :
@@ -143,23 +143,23 @@ __instclean :
 	@[ -n "$(INSTDEST)" ] || echo "Internal error (INSTDEST definition)"
 	@[ -n "$(INSTDEST)" ] && echo > /dev/null
 	@if [ -d $(INSTDEST) ] ; \
-	then\
-	  cd $(INSTSRC);\
-	  if [ -n "`ls -1 | grep -v CVS`" ]; then\
+	then \
+	  cd $(INSTSRC); \
+	  if [ -n "`ls -1 | grep -v CVS`" ]; then \
 	    for f in `ls -1 | grep -v CVS`; \
-	    do\
+	    do \
 	      if [ -f $$f ] ; \
 	      then \
-	          echo "rm -f $(INSTDEST)/$$f";\
-	          rm -f $(INSTDEST)/$$f;\
-	      fi\
-	    done\
-	  fi;\
-	  empty=`ls $(INSTDEST)`;\
-	  if [ -z "$$empty" ];\
-	  then\
-        rm -rf $(INSTDEST);\
-	  fi\
+	          echo "rm -f $(INSTDEST)/$$f"; \
+	          rm -f $(INSTDEST)/$$f; \
+	      fi \
+	    done \
+	  fi; \
+	  empty=`ls $(INSTDEST)`; \
+	  if [ -z "$$empty" ]; \
+	  then \
+        rm -rf $(INSTDEST); \
+	  fi \
 	fi