diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | lib/Makefile.am | 15 |
3 files changed, 21 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2002-02-09 C. Brian Jones <cbj@gnu.org> + + * lib/Makefile.am: without zip, try copying class files instead + during install, and avoid zip during make + * configure.in: new automake conditional to handle presence or + absence of zip + 2002-02-09 Mark Wielaard <mark@klomp.org> * doc/www.gnu.org/home.wml: Add 0.03 announcement. diff --git a/configure.in b/configure.in index 95fd8003a..942a5371b 100644 --- a/configure.in +++ b/configure.in @@ -221,9 +221,11 @@ dnl zip, and perl, however it should be okay since it is only used dnl in maintainer mode. AC_PATH_PROG(FIND, find) AC_PATH_PROG(ZIP, zip) -AC_PATH_PROG(UNZIP, unzip) +dnl AC_PATH_PROG(UNZIP, unzip) dnl AC_PATH_PROG(PERL, perl) +AM_CONDITIONAL(HAVE_ZIP, test x$ZIP != x) + AC_OUTPUT(Makefile com/Makefile com/sun/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index 2d90198ab..2a435e545 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -76,12 +76,19 @@ ARG_CLASSPATH_JAVAH = -classpath JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) .:$(USER_CLASSLIB) +if HAVE_ZIP pkgdata_DATA = glibj.zip noinst_DATA = genclasses classes +else +noinst_DATA = genclasses classes glibj.zip +endif -##install-data-local : -## if ! [ -e $(pkgdatadir) ]; then mkdir -p $(pkgdatadir); fi -## $(UNZIP) -d $(pkgdatadir) glibj.zip +install-data-local : + -$(top_srcdir)/mkinstalldirs $(pkgdatadir) + if ! [ -e glibj.zip ]; then cp -R com $(pkgdatadir); fi + if ! [ -e glibj.zip ]; then cp -R gnu $(pkgdatadir); fi + if ! [ -e glibj.zip ]; then cp -R java $(pkgdatadir); fi + if ! [ -e glibj.zip ]; then cp -R javax $(pkgdatadir); fi glibj.zip: classes compile-classes if ! [ -e gnu ]; then mkdir gnu; fi @@ -89,7 +96,7 @@ glibj.zip: classes compile-classes if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi cp $(top_srcdir)/gnu/java/locale/*.properties gnu/java/locale/ cp $(top_srcdir)/gnu/java/locale/*.uni gnu/java/locale/ - $(ZIP) -r -D glibj.zip gnu java javax > /dev/null + if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip com gnu java javax > /dev/null; fi .PHONY: genclasses |