View | Details | Raw Unified | Return to bug 193256
Collapse All | Expand All

(-)files/patch-slsh__Makefile.in (-9 / +6 lines)
Lines 1-5 Link Here
1
--- slsh/Makefile.in.orig	2011-04-10 23:37:07.000000000 -0300
1
--- slsh/Makefile.in.orig	2011-04-11 04:37:07.000000000 +0200
2
+++ slsh/Makefile.in	2014-05-14 19:25:14.000000000 -0300
2
+++ slsh/Makefile.in	2014-09-02 15:47:37.000000000 +0200
3
@@ -23,6 +23,7 @@
3
@@ -23,6 +23,7 @@
4
 #----------------------------------------------------------------------------
4
 #----------------------------------------------------------------------------
5
 INSTALL		= @INSTALL@
5
 INSTALL		= @INSTALL@
Lines 8-23 Link Here
8
 MKINSDIR	= $(CONFIG_DIR)/autoconf/mkinsdir.sh
8
 MKINSDIR	= $(CONFIG_DIR)/autoconf/mkinsdir.sh
9
 #----------------------------------------------------------------------------
9
 #----------------------------------------------------------------------------
10
 # Where system-wide slsh.rc, scripts, and library files reside
10
 # Where system-wide slsh.rc, scripts, and library files reside
11
@@ -147,9 +148,9 @@
11
@@ -148,8 +149,8 @@
12
 #
13
 install: slsh install_directories install_lib_files install_rline_files \
12
 install: slsh install_directories install_lib_files install_rline_files \
14
  install_scripts install_help install_docs
13
  install_scripts install_help install_docs
15
-	$(INSTALL) $(OBJDIR)/slsh $(DEST_BIN_DIR)/
14
 	$(INSTALL) $(OBJDIR)/slsh $(DEST_BIN_DIR)/
16
-	$(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/
15
+	echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> etc/slsh.rc
16
 	$(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/
17
-	echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc
17
-	echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc
18
+	$(INSTALL_PROGRAM) $(OBJDIR)/slsh $(DEST_BIN_DIR)/
19
+	( echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");'; cat etc/slsh.rc ) > etc/slsh.rc.new
20
+	$(INSTALL_DATA) etc/slsh.rc.new $(DEST_SLSH_CONF_DIR)/slsh.rc
21
 	$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
18
 	$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
22
 #---------------------------------------------------------------------------
19
 #---------------------------------------------------------------------------
23
 # Housekeeping
20
 # Housekeeping

Return to bug 193256