File sourcenav-5.1.4.patch of Package Source-Navigator

Overview Repositories Revisions Requests Users Attributes Meta

File sourcenav-5.1.4.patch of Package Source-Navigator (Revision 73efc2c933dadecca94332ab017c4788)

Currently displaying revision 73efc2c933dadecca94332ab017c4788 , Show latest

--- Makefile.in
+++ Makefile.in
@@ -418,7 +418,9 @@
 	"gxx_include_dir=$(gxx_include_dir)" \
 	"gcc_version=$(gcc_version)" \
 	"gcc_version_trigger=$(gcc_version_trigger)" \
-	"target_alias=$(target_alias)" 
+	"target_alias=$(target_alias)" \
+	"DESTDIR=$(DESTDIR)" \
+	"INSTALL_ROOT=$(INSTALL_ROOT)"
 
 # For any flags above that may contain shell code that varies from one
 # target library to another.  When doing recursive invocations of the
--- configure
+++ configure
@@ -697,7 +697,7 @@
 if test -f skip-this-dir; then
 	# Perform the same cleanup as the trap handler, minus the "exit 1" of course,
 	# and reset the trap handler.
-	trap 0
+	trap - 0
 	rm -rf Makefile* ${tmpdir}
 	# Execute the final clean-up actions
 	${config_shell} skip-this-dir
@@ -1599,7 +1599,7 @@
 # Perform the same cleanup as the trap handler, minus the "exit 1" of course,
 # and reset the trap handler.
 rm -rf ${tmpdir}
-trap 0
+trap - 0
 
 exit 0
 
--- itcl/Makefile.in
+++ itcl/Makefile.in
@@ -75,8 +75,8 @@
 install:
 	for dir in $(subdirs) ; do \
 		if test -d $$dir ; then \
-		    echo "$$dir: $(MAKE) $@" ;\
-		    if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \
+		    echo "$$dir: $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) $@" ;\
+		    if (cd $$dir; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) $@) ; then true ; else exit 1 ; fi ; \
 		else \
 		    exit 1; \
 		fi \
@@ -85,8 +85,8 @@
 install-binaries:
 	for dir in $(subdirs) ; do \
 		if test -d $$dir ; then \
-		    echo "$$dir: $(MAKE) $@" ;\
-		    if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \
+		    echo "$$dir: $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) $@" ;\
+		    if (cd $$dir; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) $@) ; then true ; else exit 1 ; fi ; \
 		else \
 		    exit 1; \
 		fi \
@@ -95,8 +95,8 @@
 install-libraries:
 	for dir in $(subdirs) ; do \
 		if test -d $$dir ; then \
-		    echo "$$dir: $(MAKE) $@" ;\
-		    if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \
+		    echo "$$dir: $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) $@" ;\
+		    if (cd $$dir; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) $@) ; then true ; else exit 1 ; fi ; \
 		else \
 		    exit 1; \
 		fi \
--- itcl/itcl/Makefile.in
+++ itcl/itcl/Makefile.in
@@ -272,16 +272,16 @@
 #========================================================================
 
 install-libraries: libraries
-	$(mkinstalldirs) $(includedir)
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
 	@echo "Installing header files in $(includedir)"
 	@for i in $(GENERIC_HDRS) ; do \
 	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(includedir) ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
 	done;
 	@echo "Installing library files in $(ITCL_LIBRARY)"
 	@for i in $(srcdir)/library/*.tcl ; do \
 	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(ITCL_LIBRARY) ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(ITCL_LIBRARY) ; \
 	done;
 
 #========================================================================
@@ -290,12 +290,12 @@
 #========================================================================
 
 install-doc: doc
-	$(mkinstalldirs) $(mandir)/mann
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/mann
 	@echo "Installing man pages in $(mandir)"
 	@for i in $(srcdir)/doc/*.n; \
 	    do \
 	    echo "Installing $$i"; \
-	    $(INSTALL_DATA) $$i $(mandir)/mann ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
 	    done
 
 test: $(TCLSH_PROG)
@@ -445,7 +445,7 @@
 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
 	  else :; fi; \
 	done
-	$(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
+	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
 
 #========================================================================
 # Install binary executables (e.g. .exe files)
@@ -483,7 +483,7 @@
 	$(mkinstalldirs)  $(DESTDIR)$(libdir)
 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
 	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
-	$(mkinstalldirs)  $(ITCL_LIBRARY)
+	$(mkinstalldirs)  $(DESTDIR)$(ITCL_LIBRARY)
 
 .PHONY: all binaries clean depend distclean doc install installdirs \
 libraries test
--- itcl/itk/Makefile.in
+++ itcl/itk/Makefile.in
@@ -267,16 +267,16 @@
 #========================================================================
 
 install-libraries: libraries
-	$(mkinstalldirs) $(includedir)
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
 	@echo "Installing header files in $(includedir)"
 	@for i in $(GENERIC_HDRS) ; do \
 	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(includedir) ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
 	done;
 	@echo "Installing library files in $(ITK_LIBRARY)"
 	@for i in $(srcdir)/library/*.* $(srcdir)/library/tclIndex ; do \
 	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(ITK_LIBRARY) ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(ITK_LIBRARY) ; \
 	done;
 
 #========================================================================
@@ -285,12 +285,12 @@
 #========================================================================
 
 install-doc: doc
-	$(mkinstalldirs) $(mandir)/mann
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/mann
 	@echo "Installing man pages in $(mandir)"
 	@for i in $(srcdir)/doc/*.n; \
 	    do \
 	    echo "Installing $$i info $(mandir)/mann"; \
-	    $(INSTALL_DATA) $$i $(mandir)/mann ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
 	    done
 
 test: $(TCLSH_PROG)
@@ -419,7 +419,7 @@
 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
 	  else :; fi; \
 	done
-	$(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
+	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
 
 #========================================================================
 # Install binary executables (e.g. .exe files)
@@ -457,7 +457,7 @@
 	$(mkinstalldirs)  $(DESTDIR)$(libdir)
 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
 	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
-	$(mkinstalldirs)  $(ITK_LIBRARY)
+	$(mkinstalldirs)  $(DESTDIR)$(ITK_LIBRARY)
 
 .PHONY: all binaries clean depend distclean doc install installdirs \
 libraries test
--- itcl/iwidgets3.0.0/Makefile.in
+++ itcl/iwidgets3.0.0/Makefile.in
@@ -55,7 +55,7 @@
 INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
 
 # Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR = $(prefix)/man
 
 # Directory in which to install manual entry for itclsh:
 MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
@@ -166,55 +166,55 @@
 install-binaries:
 
 install-libraries:
-	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
+	@$(MKINSTALLDIRS) $(DESTDIR)$(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
 	@rm -f $(LIB_INSTALL_DIR)/iwidgets
 	$(LN_S) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)/iwidgets
-	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/scripts
+	@$(MKINSTALLDIRS) $(DESTDIR)$(SCRIPT_INSTALL_DIR)/scripts
 	@echo "Installing files from $(GENERIC_DIR) into $(SCRIPT_INSTALL_DIR)"
 	@for i in $(GENERIC_DIR)/*.itk $(GENERIC_DIR)/*.itcl $(GENERIC_DIR)/tclIndex $(GENERIC_DIR)/*.gif ; \
 	    do \
-	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/scripts; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(SCRIPT_INSTALL_DIR)/scripts; \
 	    done;
 	@echo "Installing iwidgets.tcl pkgIndex.tcl into $(SCRIPT_INSTALL_DIR)"
 	@for i in iwidgets.tcl pkgIndex.tcl ; \
 	    do \
-	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(SCRIPT_INSTALL_DIR); \
 	    done;
 	$(MAKE) install-demos
 
 install-demos:
-	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/demos/images $(SCRIPT_INSTALL_DIR)/demos/html
+	@$(MKINSTALLDIRS) $(DESTDIR)$(SCRIPT_INSTALL_DIR)/demos/images $(DESTDIR)$(SCRIPT_INSTALL_DIR)/demos/html
 	@echo "Installing demos from $(srcdir)/demos into $(SCRIPT_INSTALL_DIR)/demos"
 	@for i in $(srcdir)/demos/*; \
 	    do \
 	    if [ -f $$i ] ; then \
-	        $(INSTALL_SCRIPT) $$i $(SCRIPT_INSTALL_DIR)/demos; \
+	        $(INSTALL_SCRIPT) $$i $(DESTDIR)$(SCRIPT_INSTALL_DIR)/demos; \
 	    fi; \
 	    done;
 	@echo "Installing images from $(srcdir)/demos/images into $(SCRIPT_INSTALL_DIR)/demos/images"
 	for i in $(srcdir)/demos/images/*; \
 	    do \
 	    if [ -f $$i ] ; then \
-	        $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \
+	        $(INSTALL_DATA) $$i $(DESTDIR)$(SCRIPT_INSTALL_DIR)/demos/images; \
 	    fi; \
 	    done;
 	@echo "Installing html from $(srcdir)/demos/html into $(SCRIPT_INSTALL_DIR)/demos/html"
 	for i in $(srcdir)/demos/html/*; \
 	    do \
 	    if [ -f $$i ] ; then \
-	        $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/html; \
+	        $(INSTALL_DATA) $$i $(DESTDIR)$(SCRIPT_INSTALL_DIR)/demos/html; \
 	    fi; \
 	    done;
 
 install-doc:
-	@$(MKINSTALLDIRS) $(MANN_INSTALL_DIR)
+	@$(MKINSTALLDIRS) $(DESTDIR)$(MANN_INSTALL_DIR)
 	@echo "Installing docs from $(TOP_DIR)/doc into $(MANN_INSTALL_DIR)"
 	@cd $(TOP_DIR)/doc; for i in *.n; \
 	    do \
 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-	        $$i > $(MANN_INSTALL_DIR)/$$i; \
+	        $$i > $(DESTDIR)$(MANN_INSTALL_DIR)/$$i; \
 	    done;
-	$(INSTALL_DATA) $(srcdir)/license.terms $(SCRIPT_INSTALL_DIR)
+	$(INSTALL_DATA) $(srcdir)/license.terms $(DESTDIR)$(SCRIPT_INSTALL_DIR)
 
 install-html:
 	@$(MKINSTALLDIRS) $(HTML_INSTALL_DIR)
--- snavigator/Makefile.am
+++ snavigator/Makefile.am
@@ -25,12 +25,12 @@
 snavigator bitmaps
 
 install-exec-local:
-	$(INSTALL) $(top_srcdir)/../COPYING $(prefix)
-	(cd ../tcl; $(MAKE) install-libraries)
-	(cd ../tk; $(MAKE) install-libraries)
-	(cd ../tix; $(MAKE) install-libraries)
-	(cd ../itcl; $(MAKE) install-libraries)
-	(cd ../libgui; $(MAKE) install)
+	$(INSTALL) $(top_srcdir)/../COPYING $(DESTDIR)$(prefix)
+	(cd ../tcl; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install-libraries)
+	(cd ../tk; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install-libraries)
+	(cd ../tix; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install-libraries)
+	(cd ../itcl; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install-libraries)
+	(cd ../libgui; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install)
 
 rootdir = $(prefix)
 
--- snavigator/Makefile.in
+++ snavigator/Makefile.in
@@ -518,12 +518,12 @@
 
 
 install-exec-local:
-	$(INSTALL) $(top_srcdir)/../COPYING $(prefix)
-	(cd ../tcl; $(MAKE) install-libraries)
-	(cd ../tk; $(MAKE) install-libraries)
-	(cd ../tix; $(MAKE) install-libraries)
-	(cd ../itcl; $(MAKE) install-libraries)
-	(cd ../libgui; $(MAKE) install)
+	$(INSTALL) $(top_srcdir)/../COPYING $(DESTDIR)$(prefix)
+	(cd ../tcl; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install-libraries)
+	(cd ../tk; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install-libraries)
+	(cd ../tix; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install-libraries)
+	(cd ../itcl; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install-libraries)
+	(cd ../libgui; $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) install)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snavigator/bitmaps/Makefile.am
+++ snavigator/bitmaps/Makefile.am
@@ -63,5 +63,5 @@
 play.xpm rplay.xpm
 
 install-data-local:
-	$(INSTALL_DATA) $(srcdir)/@SPLASHFILE@ $(imagedir)/splash.gif
-	$(INSTALL_DATA) $(srcdir)/@X11ICON@ $(imagedir)/paf.xbm
+	$(INSTALL_DATA) $(srcdir)/@SPLASHFILE@ $(DESTDIR)$(imagedir)/splash.gif
+	$(INSTALL_DATA) $(srcdir)/@X11ICON@ $(DESTDIR)$(imagedir)/paf.xbm
--- snavigator/bitmaps/Makefile.in
+++ snavigator/bitmaps/Makefile.in
@@ -333,8 +333,8 @@
 
 
 install-data-local:
-	$(INSTALL_DATA) $(srcdir)/@SPLASHFILE@ $(imagedir)/splash.gif
-	$(INSTALL_DATA) $(srcdir)/@X11ICON@ $(imagedir)/paf.xbm
+	$(INSTALL_DATA) $(srcdir)/@SPLASHFILE@ $(DESTDIR)$(imagedir)/splash.gif
+	$(INSTALL_DATA) $(srcdir)/@X11ICON@ $(DESTDIR)$(imagedir)/paf.xbm
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snavigator/db/Makefile.am
+++ snavigator/db/Makefile.am
@@ -42,8 +42,8 @@
 CPPLib=$(CPPLibDir)/libcpp2.a
 
 install-data-local:
-	$(INSTALL_DATA) $(top_builddir)/../db/PORT/libdb.a $(sdkdir)/libpafdb.a
-	$(RANLIB) $(sdkdir)/libpafdb.a
+	$(INSTALL_DATA) $(top_builddir)/../db/PORT/libdb.a $(DESTDIR)$(sdkdir)/libpafdb.a
+	$(RANLIB) $(DESTDIR)$(sdkdir)/libpafdb.a
 
 dbcp_SOURCES = dbcp.c
 dbcp_LDADD = libdbutils.a $(DB_LIBDIR)/libdb.a
--- snavigator/db/Makefile.in
+++ snavigator/db/Makefile.in
@@ -582,8 +582,8 @@
 
 
 install-data-local:
-	$(INSTALL_DATA) $(top_builddir)/../db/PORT/libdb.a $(sdkdir)/libpafdb.a
-	$(RANLIB) $(sdkdir)/libpafdb.a
+	$(INSTALL_DATA) $(top_builddir)/../db/PORT/libdb.a $(DESTDIR)$(sdkdir)/libpafdb.a
+	$(RANLIB) $(DESTDIR)$(sdkdir)/libpafdb.a
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snavigator/demo/Makefile.am
+++ snavigator/demo/Makefile.am
@@ -5,16 +5,16 @@
 demosdir = $(datadir)/demos
 
 install-data-local:
-	@$(mkinstalldirs) $(demosdir)
+	@$(mkinstalldirs) $(DESTDIR)$(demosdir)
 	echo CVS > /tmp/sn-install-$$$$ ; \
 	for p in @C_DEMO@ @ASM_DEMO@ @FOR_DEMO@ @COB_DEMO@ @MONOP_DEMO@ @JAV_DEMO@ ; do \
 	  echo "copying $$p to $(demosdir)" ; \
 	  ( \
 	  cd $(srcdir) ; \
 	  $(TAR) -ch$(OLDTARFLAG) -f /tmp/$$p.tar-$$$$ -X /tmp/sn-install-$$$$ $$p ; \
-	  cp /tmp/$$p.tar-$$$$ $(demosdir)/$$p.tar-$$$$ ; \
+	  cp /tmp/$$p.tar-$$$$ $(DESTDIR)$(demosdir)/$$p.tar-$$$$ ; \
 	  rm /tmp/$$p.tar-$$$$ ; \
-	  cd $(demosdir) ; \
+	  cd $(DESTDIR)$(demosdir) ; \
 	  $(TAR) -xf $$p.tar-$$$$ ; \
 	  rm $$p.tar-$$$$ ; \
           ) \
--- snavigator/demo/Makefile.in
+++ snavigator/demo/Makefile.in
@@ -288,16 +288,16 @@
 
 
 install-data-local:
-	@$(mkinstalldirs) $(demosdir)
+	@$(mkinstalldirs) $(DESTDIR)$(demosdir)
 	echo CVS > /tmp/sn-install-$$$$ ; \
 	for p in @C_DEMO@ @ASM_DEMO@ @FOR_DEMO@ @COB_DEMO@ @MONOP_DEMO@ @JAV_DEMO@ ; do \
 	  echo "copying $$p to $(demosdir)" ; \
 	  ( \
 	  cd $(srcdir) ; \
 	  $(TAR) -ch$(OLDTARFLAG) -f /tmp/$$p.tar-$$$$ -X /tmp/sn-install-$$$$ $$p ; \
-	  cp /tmp/$$p.tar-$$$$ $(demosdir)/$$p.tar-$$$$ ; \
+	  cp /tmp/$$p.tar-$$$$ $(DESTDIR)$(demosdir)/$$p.tar-$$$$ ; \
 	  rm /tmp/$$p.tar-$$$$ ; \
-	  cd $(demosdir) ; \
+	  cd $(DESTDIR)$(demosdir) ; \
 	  $(TAR) -xf $$p.tar-$$$$ ; \
 	  rm $$p.tar-$$$$ ; \
           ) \
--- snavigator/packages/Makefile.am
+++ snavigator/packages/Makefile.am
@@ -28,6 +28,6 @@
 install-data-local:
 	for i in $(packages); \
 	    do \
-		mkdir -p $(progdir)/$$i ;\
-		cp -p $(srcdir)/$$i/*.tcl $(progdir)/$$i; \
+		mkdir -p $(DESTDIR)$(progdir)/$$i ;\
+		cp -p $(srcdir)/$$i/*.tcl $(DESTDIR)$(progdir)/$$i; \
 	    done;
--- snavigator/packages/Makefile.in
+++ snavigator/packages/Makefile.in
@@ -312,8 +312,8 @@
 install-data-local:
 	for i in $(packages); \
 	    do \
-		mkdir -p $(progdir)/$$i ;\
-		cp -p $(srcdir)/$$i/*.tcl $(progdir)/$$i; \
+		mkdir -p $(DESTDIR)$(progdir)/$$i ;\
+		cp -p $(srcdir)/$$i/*.tcl $(DESTDIR)$(progdir)/$$i; \
 	    done;
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- snavigator/parsers/toolbox/Makefile.in
+++ snavigator/parsers/toolbox/Makefile.in
@@ -189,7 +189,7 @@
 
 libsnptools_a_SOURCES = snptools.c snptools.h
 
-sdkincludedir = $(datadir)/sdk/include
+sdkincludedir = @SN_SDK_EXEC_PREFIX@/include
 sdkinclude_HEADERS = snptools.h
 
 sdklibdir = @SN_SDK_EXEC_PREFIX@/lib
--- snavigator/sdk/Makefile.am
+++ snavigator/sdk/Makefile.am
@@ -22,7 +22,8 @@
 ## Process this file with automake to create Makefile.in.
 
 SUBDIRS = api parsers
+sdklibdir = @SN_SDK_EXEC_PREFIX@/lib
 
 install-exec-local:
-	$(INSTALL_DATA) @TCL_LIB_FULL_PATH@ @SN_SDK_EXEC_PREFIX@/lib
+	$(INSTALL_DATA) @TCL_LIB_FULL_PATH@ $(DESTDIR)$(sdklibdir)
 
--- snavigator/sdk/Makefile.in
+++ snavigator/sdk/Makefile.in
@@ -202,7 +202,7 @@
 X11ICON = @X11ICON@
 YACC = @YACC@
 ac_cv_c_itclsh = @ac_cv_c_itclsh@
-
+sdklibdir = @SN_SDK_EXEC_PREFIX@/lib
 AUTOMAKE_OPTIONS = cygnus
 
 SUBDIRS = api parsers
@@ -412,7 +412,7 @@
 
 
 install-exec-local:
-	$(INSTALL_DATA) @TCL_LIB_FULL_PATH@ @SN_SDK_EXEC_PREFIX@/lib
+	$(INSTALL_DATA) @TCL_LIB_FULL_PATH@ $(DESTDIR)$(sdklibdir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snavigator/sdk/api/c/Makefile.am
+++ snavigator/sdk/api/c/Makefile.am
@@ -27,8 +27,8 @@
 sdkinclude_h = db.h cdefs.h
 
 install-data-local:
-	$(mkinstalldirs) $(sdkincludedir)
+	$(mkinstalldirs) $(DESTDIR)$(sdkincludedir)
 	for h in $(sdkinclude_h) ; do \
-	    cp $(top_srcdir)/../db/include/$$h $(sdkincludedir) ;\
+	    cp $(top_srcdir)/../db/include/$$h $(DESTDIR)$(sdkincludedir) ;\
 	done
 
--- snavigator/sdk/api/c/Makefile.in
+++ snavigator/sdk/api/c/Makefile.in
@@ -415,9 +415,9 @@
 
 
 install-data-local:
-	$(mkinstalldirs) $(sdkincludedir)
+	$(mkinstalldirs) $(DESTDIR)$(sdkincludedir)
 	for h in $(sdkinclude_h) ; do \
-	    cp $(top_srcdir)/../db/include/$$h $(sdkincludedir) ;\
+	    cp $(top_srcdir)/../db/include/$$h $(DESTDIR)$(sdkincludedir) ;\
 	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- snavigator/snavigator/unix/Makefile.am
+++ snavigator/snavigator/unix/Makefile.am
@@ -31,4 +31,4 @@
 install-exec-local: $(bindir)/@SN_LAUNCH_SHELL@
 
 $(bindir)/@SN_LAUNCH_SHELL@: snavigator
-	$(INSTALL_SCRIPT) snavigator $(bindir)/@SN_LAUNCH_SHELL@
+	$(INSTALL_SCRIPT) snavigator $(DESTDIR)$(bindir)/@SN_LAUNCH_SHELL@
--- snavigator/snavigator/unix/Makefile.in
+++ snavigator/snavigator/unix/Makefile.in
@@ -339,7 +339,7 @@
 install-exec-local: $(bindir)/@SN_LAUNCH_SHELL@
 
 $(bindir)/@SN_LAUNCH_SHELL@: snavigator
-	$(INSTALL_SCRIPT) snavigator $(bindir)/@SN_LAUNCH_SHELL@
+	$(INSTALL_SCRIPT) snavigator $(DESTDIR)$(bindir)/@SN_LAUNCH_SHELL@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- tcl/unix/Makefile.in
+++ tcl/unix/Makefile.in
@@ -35,7 +35,7 @@
 # to be different than those used for actually reference files at
 # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
 # when installing files.
-INSTALL_ROOT		=
+#INSTALL_ROOT		=
 
 TCL_LIBRARY =	@datadir@/tcl$(VERSION)
 
--- tix/unix/Makefile.in
+++ tix/unix/Makefile.in
@@ -28,19 +28,19 @@
 # Directory in which to install the library of Tix scripts and demos
 # (note: you can set the TIX_LIBRARY environment variable at run-time to
 # override the compiled-in location):
-TIX_LIBRARY =	$(prefix)/share/tix$(TIX_VERSION)
+TIX_LIBRARY =	$(INSTALL_ROOT)$(prefix)/share/tix$(TIX_VERSION)
 
 # Directory in which to install the archive libtix.a:
-LIB_DIR =	$(exec_prefix)/lib
+LIB_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
 
 # Directory in which to install the program wish:
-BIN_DIR =	$(exec_prefix)/bin
+BIN_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
 
 # Directory in which to install the include file tix.h:
-INCLUDE_DIR =	$(prefix)/include
+INCLUDE_DIR =	$(INSTALL_ROOT)$(prefix)/include
 
 # Top-level directory for manual entries:
-MAN_DIR =	$(prefix)/man
+MAN_DIR =	$(INSTALL_ROOT)$(prefix)/man
 
 # Directory in which to install manual entry for wish:
 MAN1_DIR =	$(MAN_DIR)/man1
@@ -116,7 +116,7 @@
 	    if test -r $$i/Makefile; then \
 	        echo "Entering directory $$i"; \
 	        cd $$i; \
-	        $(MAKE) prefix=$(prefix) \
+	        $(MAKE) prefix=$(prefix) INSTALL_ROOT=$(INSTALL_ROOT) \
 		    exec_prefix=$(exec_prefix) _install_; \
 	        cd ..; \
             fi; \
--- tix/unix/tk8.3/Makefile.in
+++ tix/unix/tk8.3/Makefile.in
@@ -36,12 +36,12 @@
 TIX_LIBRARY =	$(prefix)/share/tix$(TIX_VERSION)
 
 # Directory in which to install the archive libtix.a:
-LIB_DIR =	$(exec_prefix)/lib
+LIB_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
 LIB_INSTALL_DIR = $(LIB_DIR)
 LIB_RUNTIME_DIR = $(LIB_DIR)
 
 # Directory in which to install the program tixwish:
-BIN_DIR =	$(exec_prefix)/bin
+BIN_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
 
 # To change the compiler switches, for example to change from -O
 # to -g, change the following line:
@@ -68,7 +68,7 @@
 #
 TCL_SRC_DIR     = @TCL_SRC_DIR@
 TCL_GENERIC_DIR = $(TCL_SRC_DIR)/generic
-TCL_BIN_DIR	= @TCL_BIN_DIR@
+TCL_BIN_DIR	= $(DESTDIR)/@TCL_BIN_DIR@
 
 # Location of the Tk 8.1 source directory.
 #
@@ -482,7 +482,7 @@
 		fi; \
 	    done;
 	@echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(TIX_LIB_FILE)"
-	@$(INSTALL_DATA) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE)
+	@$(INSTALL_PROGRAM) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE)
 	@echo "Installing $(TIX_EXE_FILE) as $(BIN_DIR)/$(INST_EXE)"
 	@$(INSTALL_PROGRAM) $(TIX_EXE_FILE) $(BIN_DIR)/$(INST_EXE)
 
--- tk/Makefile.in
+++ tk/Makefile.in
@@ -11,7 +11,7 @@
 @SET_MAKE@
 
 all install install-binaries install-libraries install-minimal:
-	@cd $(CONFIGDIR) && $(MAKE) $@
+	@cd $(CONFIGDIR) && $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(INSTALL_ROOT) $@
 
 # Nothing for these yet.
 installcheck install-info info:
--- tk/unix/Makefile.in
+++ tk/unix/Makefile.in
@@ -37,7 +37,7 @@
 # to be different than those used for actually reference files at
 # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
 # when installing files.
-INSTALL_ROOT		=
+#INSTALL_ROOT		=
 
 # Directory from which applications will reference the library of Tcl
 # scripts (note: you can set the TK_LIBRARY environment variable at

Places

File sourcenav-5.1.4.patch of Package Source-Navigator (Revision 73efc2c933dadecca94332ab017c4788)

Places