[patch] source patch

scm-5.5.4-gentoo.patch (text/plain), 2.79 KB, created by Vadim Kuznetsov (RETIRED) on 2009-01-12 16:02:41 UTC

--- Makefile.orig	2007-11-28 00:10:10.000000000 -0500
+++ Makefile	2009-01-08 10:20:09.000000000 -0500
@@ -85,11 +85,11 @@
 	echo "CPROTO=`type cproto | sed 's%.* %%'`" > srcdir.mk
 	echo "srcdir=`pwd`/" >> srcdir.mk
 #srcdir=$(HOME)/scm/
-#srcdir=/usr/local/src/scm/
+#srcdir=/usr/src/scm/
 include srcdir.mk
 
 # directory where COPYING and InitXXX.scm reside.
-#IMPLPATH = /usr/local/src/scm/
+#IMPLPATH = /usr/src/scm/
 #this one is good for bootstrapping
 #IMPLPATH = `pwd`/
 IMPLPATH=$(srcdir)
@@ -219,7 +219,6 @@
 udscm5:	$(cfiles) $(ufiles) $(hfiles) build.scm build udscm5.opt
 	$(BUILD) -f udscm5.opt -o udscm5 -s $(IMPLPATH)
 	-rm $(ofiles) scmmain.o
-	strip udscm5
 dscm5:	udscm5 $(ifiles) require.scm
 	if [ -f /proc/sys/kernel/randomize_va_space -a\
 	     "`cat /proc/sys/kernel/randomize_va_space`" != "0" ]; then {\
@@ -413,7 +412,7 @@
 PREVDOCS = prevdocs/
 html:	$(htmldir)scm_toc.html $(htmldir)Xlibscm_toc.html $(htmldir)hobbit_toc.html
 
-TEXI2HTML = /usr/local/bin/texi2html -split -verbose
+TEXI2HTML = /usr/bin/texi2html -split -verbose
 scm_toc.html:	version.txi scm.texi indexes.texi platform.txi features.txi
 	${TEXI2HTML} scm.texi
 Xlibscm_toc.html:	version.txi Xlibscm.texi
@@ -445,14 +444,14 @@
 
 rpm_prefix=$(HOME)/rpmbuild/
 
-prefix = /usr/local/
+prefix = /usr/
 exec_prefix = $(prefix)
 # directory where `make install' will put executable.
 bindir = $(exec_prefix)bin/
 libdir = $(exec_prefix)lib/
 libscmdir = $(libdir)scm/
 # directory where `make install' will put manual page.
-mandir = $(prefix)man/
+mandir = $(prefix)share/man/
 man1dir = $(mandir)man1/
 infodir = $(prefix)info/
 includedir = $(prefix)include/
@@ -506,14 +505,13 @@
 	gzip -f $(DESTDIR)$(infodir)hobbit.info
 
 install:	scm.1
-	test -d $(DESTDIR)$(bindir) || mkdir $(DESTDIR)$(bindir)
-	test -d $(DESTDIR)$(mandir) || mkdir $(DESTDIR)$(mandir)
-	test -d $(DESTDIR)$(man1dir) || mkdir $(DESTDIR)$(man1dir)
+	mkdir -p $(DESTDIR)$(bindir)
+	mkdir -p $(DESTDIR)$(mandir)
+	mkdir -p $(DESTDIR)$(man1dir)
 	-cp scm scmlit $(DESTDIR)$(bindir)
-	-strip $(DESTDIR)$(bindir)scmlit
 	-cp scm.1 $(DESTDIR)$(man1dir)
-	test -d $(DESTDIR)$(libdir) || mkdir $(DESTDIR)$(libdir)
-	test -d $(DESTDIR)$(libscmdir) || mkdir $(DESTDIR)$(libscmdir)
+	mkdir -p $(DESTDIR)$(libdir)
+	mkdir -p $(DESTDIR)$(libscmdir)
 	-cp $(ifiles) $(hobfiles) COPYING r4rstest.scm $(DESTDIR)$(libscmdir)
 	test -f $(DESTDIR)$(libscmdir)require.scm || \
 		cp requires.scm $(DESTDIR)$(libscmdir)require.scm
@@ -523,9 +521,9 @@
 	-cp libscm.dylib $(DESTDIR)$(libdir)
 
 installlib:
-	test -d $(DESTDIR)$(includedir) || mkdir $(DESTDIR)$(includedir)
+	mkdir -p $(DESTDIR)$(includedir)
 	cp scm.h scmfig.h scmflags.h $(DESTDIR)$(includedir)
-	test -d $(DESTDIR)$(libdir) || mkdir $(DESTDIR)$(libdir)
+	mkdir -p $(DESTDIR)$(libdir)
 	cp libscm.a $(DESTDIR)$(libdir)libscm.a
 
 uninstall: