Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Sep 2014 15:27:35 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367031 - head/devel/libslang2/files
Message-ID:  <201409021527.s82FRZU4094600@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Tue Sep  2 15:27:34 2014
New Revision: 367031
URL: http://svnweb.freebsd.org/changeset/ports/367031
QAT: https://qat.redports.org/buildarchive/r367031/

Log:
  - Fix Makefile.in patch
  
  PR:		193256
  Submitted by:	gahr

Modified:
  head/devel/libslang2/files/patch-slsh__Makefile.in

Modified: head/devel/libslang2/files/patch-slsh__Makefile.in
==============================================================================
--- head/devel/libslang2/files/patch-slsh__Makefile.in	Tue Sep  2 15:25:11 2014	(r367030)
+++ head/devel/libslang2/files/patch-slsh__Makefile.in	Tue Sep  2 15:27:34 2014	(r367031)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409021527.s82FRZU4094600>