SableVM SDK - suggested patch

David =?unknown-8bit?Q?B=E9langer?= <[email protected]> Sat, 21 May 2005 00:00:40 -0400
Newsgroups gmane.comp.java.vm.sablevm.devel
Message-ID <[email protected]>
What about this patch for SableVM SDK?

It specifies bindir, libdir, ... via module specific configure
options.



David

---

David Bélanger
Graduate Student
School of Computer Science
McGill University
Office: MC226

Web page:   http://www.cs.mcgill.ca/~dbelan2/
Public key: http://www.cs.mcgill.ca/~dbelan2/public_key.txt

_______________________________________________
SableVM-devel mailing list
[email protected]
http://sablevm.org/lists/control/listinfo/sablevm-devel
dir.patch (text/plain, 2.2 KB)
--- configure.in.orig	2005-05-20 16:32:47.000000000 -0400
+++ configure.in	2005-05-20 20:08:09.422510384 -0400
@@ -196,6 +196,9 @@
 if test "$with_jikes" = "internal"; then EARLY_BUILD="$EARLY_BUILD jikes"; fi
 if test "$with_fastjar" = "internal"; then EARLY_BUILD="$EARLY_BUILD fastjar"; fi
 
+fastjar_CONFIGURE_ARGS="--bindir=${libdir}/sablevm/bin --mandir=${libdir}/sablevm/man"
+gjdoc_CONFIGURE_ARGS="--bindir=${libdir}/sablevm/bin --datadir=${libdir}/sablevm/lib --mandir=${libdir}/sablevm/man --infodir=${libdir}/sablevm/info"
+
 ALL_MODULES="$EARLY_CONFIGURE $MAIN_CONFIGURE $EXTRA_CONFIGURE"
 INSTALL_ALL="$EARLY_BUILD $MAIN_BUILD $EXTRA_BUILD"
 
--- fastjar/Makefile.am.orig	2005-05-20 21:47:27.150798016 -0400
+++ fastjar/Makefile.am	2005-05-20 21:46:25.754131728 -0400
@@ -1,7 +1,6 @@
 # Process this with automake to create Makefile.in
 
 bin_PROGRAMS = fastjar grepjar
-bindir = $(DESTDIR)$(libdir)/sablevm/bin
 fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c shift.c jartool.h \
 zipfile.h dostime.h compress.h pushback.h shift.h
 fastjar_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_SHIFT_DOWN
@@ -13,5 +12,4 @@
 
 AM_CFLAGS = @fastjar_warn_cflags@
 man_MANS = fastjar.1 grepjar.1
-mandir = $(DESTDIR)$(libdir)/sablevm/man
 EXTRA_DIST = $(man_MANS)
--- gjdoc/Makefile.am.orig	2005-05-20 21:44:13.168287840 -0400
+++ gjdoc/Makefile.am	2005-05-20 21:44:24.047633928 -0400
@@ -20,10 +20,6 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307 USA.
 
-bindir = $(DESTDIR)$(libdir)/sablevm/bin
-datadir = $(DESTDIR)$(libdir)/sablevm/lib
-mandir = $(DESTDIR)$(libdir)/sablevm/man
-
 AM_GCJFLAGS = --classpath=$(CLASSPATH) -fassume-compiled -I$(srcdir)/src -I$(srcdir) -I$(ANTLR_JAR) -I.
 
 USE_JAVAC_FLAGS = -classpath $(CLASSPATH):$(srcdir)/src:$(srcdir):$(ANTLR_JAR):. $(JAVAC_FLAGS)
--- gjdoc/docs/Makefile.am.orig	2005-05-20 21:44:48.409930296 -0400
+++ gjdoc/docs/Makefile.am	2005-05-20 21:45:02.230829200 -0400
@@ -20,9 +20,6 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307 USA.
 
-mandir = $(DESTDIR)$(libdir)/sablevm/man
-infodir = $(DESTDIR)$(libdir)/sablevm/info
-
 TEXIPOD = $(srcdir)/../contrib/texi2pod.pl
 POD2MAN = pod2man