Another RPM & patches.

Geoff Wong geoff@REDACTED
Thu Feb 3 00:56:15 CET 2000


Per tells me I've confused his patch numbering scheme.
So wherever I've got "tmp_patch*" consider it to be "local_patch*" 
for all patch numbers >= 9 :-) [ you can tell by the source lines
in the RPM where they come from anyway ].

Also noticed a slight problem with local_patch_R6B0.9.txt.
The order of the args to "Install" matters because I shifted in 
the script without checking for the null arg case.
So here it is again (fixed):

---------------- local_patch_R6B0.9.txt (cut here).

--- Makefile.in.ORIG	Mon Jan 31 17:41:33 2000
+++ Makefile.in	Thu Feb  3 10:45:06 2000
@@ -61,6 +61,7 @@
 
 # You can *not* change these two, they have to stay this way for now.
 ERLANG_BINDIR     = $(ERLANG_LIBDIR)/bin
+ERLANG_IBINDIR     = $(ERLANG_ILIBDIR)/bin
 ERLANG_ERTSBINDIR = $(ERLANG_LIBDIR)/$(ERTS)/bin
 
 # The directory in which man pages for above executables are put
@@ -105,6 +106,8 @@
 # depending on which system is preferred.)
 LOCAL_PATH     = $(ERL_TOP)/erts/bin/$(TARGET):$(ERL_TOP)/erts/bin
 BOOTSTRAP_PATH = $(ERL_TOP)/bootstrap/bin
+PATH := $(LOCAL_PATH):$(BOOTSTRAP_PATH):$(PATH)
+export PATH
 
 # ----------------------------------------------------------------------
 
@@ -166,15 +169,15 @@
 	  $(MAKE) TESTROOT=$(ERLANG_LIBDIR) BUILD_ALL=true release 
 
 install.Install:
-	cd $(ERLANG_LIBDIR) && ./Install -minimal $(ERLANG_LIBDIR)
+	cd $(ERLANG_LIBDIR) && ./Install -minimal $(ERLANG_ILIBDIR) -prefix $(INSTALL_PREFIX) 
 
 #
 # Erlang base public files
 #
 install.bin:
 	rm -f $(BINDIR)/erl $(BINDIR)/erlc
-	${LN_S} $(ERLANG_BINDIR)/erl      $(BINDIR)/erl
-	${LN_S} $(ERLANG_BINDIR)/erlc     $(BINDIR)/erlc
+	${LN_S} $(ERLANG_IBINDIR)/erl      $(BINDIR)/erl
+	${LN_S} $(ERLANG_IBINDIR)/erlc     $(BINDIR)/erlc
 
 #
 # Directories needed before we can install




More information about the erlang-questions mailing list