[patch] Fixes man page paths, removes sandbox violation

scotty-2.1.11-Makefile.patch (text/plain), 2.36 KB, created by Mike Green on 2005-04-09 23:32:20 UTC

--- unix/Makefile.in	2001-06-15 05:06:35.000000000 -0500
+++ unix/Makefile.in	2005-04-09 23:52:13.000000000 -0500
@@ -26,25 +26,25 @@
 exec_prefix =	@exec_prefix@
 
 # Directory in which to install the program scotty:
-BIN_INSTALL_DIR =	$(exec_prefix)/bin
+BIN_INSTALL_DIR =	$(DESTDIR)$(exec_prefix)/bin
 
 # Directory in which to install dynamic loadable modules:
-LIB_INSTALL_DIR =       $(exec_prefix)/lib
+LIB_INSTALL_DIR =       $(DESTDIR)$(exec_prefix)/lib
 
 # Directory in which dynamic loadable modules are installed:
-LIB_RUNTIME_DIR =       $(exec_prefix)/lib
+LIB_RUNTIME_DIR =       $(DESTDIR)$(exec_prefix)/lib
 
 # Directory in which to install library files belonging to the extension.
-TNM_INSTALL_DIR =	$(prefix)/lib/tnm$(TNM_VERSION)
+TNM_INSTALL_DIR =	$(DESTDIR)$(prefix)/lib/tnm$(TNM_VERSION)
 
 # Directory in which to install library files belonging to the extension.
-TCL_INSTALL_DIR =	$(prefix)/lib/tcl$(TCL_VERSION)
+TCL_INSTALL_DIR =	$(DESTDIR)$(prefix)/lib/tcl$(TCL_VERSION)
 
 # Directory in which to install the library of tkined scripts.
-TKI_INSTALL_DIR =	$(prefix)/lib/tkined$(TKI_VERSION)
+TKI_INSTALL_DIR =	$(DESTDIR)$(prefix)/lib/tkined$(TKI_VERSION)
 
 # Top-level directory for manual entries:
-MAN_INSTALL_DIR =	$(prefix)/man
+MAN_INSTALL_DIR =	$(DESTDIR)$(prefix)/man
 
 # Directory in which to install the manual entries:
 MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
@@ -526,10 +526,23 @@
 	    echo "Installing $$i"; \
 	    $(INSTALL_DATA) $$i $(TNM_INSTALL_DIR)/mibs ; \
 	    done
-	@TCLLIBPATH="$(TNM_INSTALL_DIR) $$TCLLIBPATH"; \
-	export TCLLIBPATH; \
-	echo 'foreach f $$tnm(mibs) {puts "Parsing $$f"; mib load $$f}; exit' | \
-		./scotty
+	# from the mib man page:
+	# ===
+	# The mib load command loads the MIB definitions contained in file.
+	# <snip>
+	# A condensed  format  of  the  MIB  definition  is  saved  in  a
+	# platform  specific  sub-directory  below $tnm(library)  to speed
+	# up future load commands. Note, this requires write permissions for
+	# the platform specific sub-directory.
+	# ===
+	#
+	# The behaviour described in the last four lines causes
+	# sandbox violations, so we leave this out here (stsp).
+	#
+	#@TCLLIBPATH="$(TNM_INSTALL_DIR) $$TCLLIBPATH"; \
+	#export TCLLIBPATH; \
+	#echo 'foreach f $$tnm(mibs) {puts "Parsing $$f"; mib load $$f}; exit' | \
+	#	./scotty

 tnm-install-library:
 	@for i in $(TNM_INSTALL_DIR)/library ; \