2bc39f1796
. build with or without TK (triggered by the NO_X knob) . build against TCL-8.3 -- with or without stubs . fix some bugs in the core Scotty code -- most notably a bug in the icmp-command implementation, where an off-by-one error in the argument processing loop resulted in random crashes; all this fixes are grouped into a single file patch-fixes . make scotty executable itself as small as it needs to be Approved by: maintainer Perhaps, some day the security officer will tell me what _exactly_ is wrong with regular Scotty (this one is beta of the new version), and I'll be able to freshen that one up too and remove the FORBIDDEN.
46 lines
2.3 KiB
Text
46 lines
2.3 KiB
Text
--- Makefile.in Wed Feb 16 11:08:00 2000
|
|
+++ Makefile.in Thu Mar 8 19:20:25 2001
|
|
@@ -56,7 +56,7 @@
|
|
|
|
# To change the compiler switches, for example to change from -O
|
|
# to -g, change the following line:
|
|
-CFLAGS = -O
|
|
+CFLAGS = @CFLAGS@
|
|
|
|
# NMICMPD should contain the full path to the installed nmicmpd binary.
|
|
NMICMPD = $(BIN_INSTALL_DIR)/nmicmpd
|
|
@@ -473,7 +473,7 @@
|
|
$(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
|
|
|
|
tnm$(SHLIB_SUFFIX): $(TNM_OBJS)
|
|
- $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) $(LIBS)
|
|
+ $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) @NEED_TCL_LIB@ $(LIBS)
|
|
|
|
tkined: tkined$(SHLIB_SUFFIX) $(UNIX_DIR)/tkined.in
|
|
@sed -e 's+%WISH%+$(TK_WISH)+' \
|
|
@@ -528,7 +528,7 @@
|
|
@$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
|
|
@$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
|
|
@chmod 555 $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
|
|
- @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
|
|
+ @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION).so"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
|
|
|
|
tnm-install-man:
|
|
@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN8_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
|
|
@@ -708,10 +708,14 @@
|
|
fi; \
|
|
done;
|
|
@echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
|
|
- @$(INSTALL_PROGRAM) tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
|
|
+ @$(INSTALL_DATA) -m 555 tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
|
|
+ @sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
|
|
+ @sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
|
|
+ @$(INSTALL_DATA) -m 555 tkined.sh ${BIN_INSTALL_DIR}/tkined
|
|
+ @$(INSTALL_DATA) -m 555 scotty.sh ${BIN_INSTALL_DIR}/scotty
|
|
@$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
|
|
@chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
|
|
- @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
|
|
+ @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION).so"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
|
|
@$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
|
|
|
|
tki-install-man:
|