[Gsrc-commit] /srv/bzr/gsrc/trunk r1132: clean up scm and fix install

[Brandon Invergo]

------------------------------------------------------------
revno: 1132
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-11 19:40:40 +0100
message:
  clean up scm and fix install
added:
  gnu/scm/config.mk
modified:
  gnu/scm/Makefile

=== modified file 'gnu/scm/Makefile'
--- a/gnu/scm/Makefile  2012-09-01 19:58:53 +0000
+++ b/gnu/scm/Makefile  2012-11-11 18:40:40 +0000
@@ -1,30 +1,30 @@
 GARNAME = scm
 GARVERSION = 5e7
+HOME_URL =  http://people.csail.mit.edu/jaffer/SCM
+DESCRIPTION = The SCM Scheme implementation
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = scm/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
 PATCHFILES = fix-wildcard.diff
-PATCHOPTS = -p2
-
 WORKSRC = $(EXTRACTDIR)/scm/
-
 CONFIGURE_SCRIPTS = $(WORKSRC)/configure
 BUILD_SCRIPTS = $(WORKSRC)/Makefile 
-INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile-DESTDIR
 
-# BUILDDEPS = 
+BUILDDEPS = 
 LIBDEPS = slib termcap readline
 
-HOME_URL =  http://people.csail.mit.edu/jaffer/SCM
-DESCRIPTION = The SCM Scheme implementation
+######################################################################
 
 include ../../gar.mk
+include config.mk
 
-CONFIGURE_ARGS = --oldincludedir=$(prefix)/include
+PATCHOPTS = -p2
+CONFIGURE_ARGS += --oldincludedir=$(prefix)/include
 
 configure-$(WORKSRC)/configure:
        cd $(WORKSRC) && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS)

=== added file 'gnu/scm/config.mk'
--- a/gnu/scm/config.mk 1970-01-01 00:00:00 +0000
+++ b/gnu/scm/config.mk 2012-11-11 18:40:40 +0000
@@ -0,0 +1,4 @@
+## Configuration options for scm ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=