r471 - in x86/trunk/packages: readline vim

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Aug 1 15:45:26 PDT 2005


Author: thomasp
Date: 2005-08-01 16:45:25 -0600 (Mon, 01 Aug 2005)
New Revision: 471

Modified:
   x86/trunk/packages/readline/Makefile
   x86/trunk/packages/vim/Makefile
Log:
fixed a few minor issues when testing readline and vim builds

Modified: x86/trunk/packages/readline/Makefile
===================================================================
--- x86/trunk/packages/readline/Makefile	2005-08-01 22:44:39 UTC (rev 470)
+++ x86/trunk/packages/readline/Makefile	2005-08-01 22:45:25 UTC (rev 471)
@@ -11,7 +11,7 @@
 
 PATCH1= $(DIR)-fixes-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 9866094fcb9cedf702744b177d19d4fa0079c9c9
+SHA-$(PATCH1)= 085d0d973d1a39707c26454db1d414957a85e2d0
 
 # Targets
 # =============================================================================

Modified: x86/trunk/packages/vim/Makefile
===================================================================
--- x86/trunk/packages/vim/Makefile	2005-08-01 22:44:39 UTC (rev 470)
+++ x86/trunk/packages/vim/Makefile	2005-08-01 22:45:25 UTC (rev 471)
@@ -32,14 +32,14 @@
 
 stage2: Makefile $(FILE) $(FILE2) $(PATCH1)
 	@$(std_build)
-	@cp $(SRC)/{$(FILE1),$(FILE2),$(PATCH1)} $(LFSSRC)
+	@cp $(SRC)/{$(FILE),$(FILE2),$(PATCH1)} $(LFSSRC)
 
 compile-stage2:
 	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@unpack $(FILE2) --strip-components=1
+	@unpack ../$(FILE2) --strip-components=1
 	@echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 	@patch -Np1 -i ../$(PATCH1)
 	@./configure --prefix=/usr --enable-multibyte >../$(DIR)-$@.log 2>&1
@@ -77,7 +77,7 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@unpack $(FILE2) --strip-components=1
+	@unpack ../$(FILE2) --strip-components=1
 	@echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 	@echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
 	@patch -Np1 -i ../$(PATCH1)




More information about the livecd mailing list