Attachment 146681 Details for Bug 193256 – Fix slsh.rc

[patch] Fix slsh.rc

libslang2-files-patch-slsh__Makefile.in (text/plain), 1.66 KB, created by Pietro Cerutti on 2014-09-02 13:49:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2014-09-02 13:49:07 UTC

Size: 1.66 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 193256: 146681