diff options
| author | Brian Jones <cbj@gnu.org> | 2002-02-10 04:10:50 +0000 |
|---|---|---|
| committer | Brian Jones <cbj@gnu.org> | 2002-02-10 04:10:50 +0000 |
| commit | b196001512392ccf7d00dc61f96e1b5d3768dd57 (patch) | |
| tree | e486b83b0b28c515149f78434cabfdbbbfd930a6 /lib/Makefile.am | |
| parent | 6327059104a6a64c6f3f78ca24460ce0ae7076ce (diff) | |
| download | classpath-b196001512392ccf7d00dc61f96e1b5d3768dd57.tar.gz | |
* lib/Makefile.am: without zip, try copying class files instead
during install, avoid zip during make
* configure.in: new automake conditional to handle presence or
absence of zip
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 15 |
1 files changed, 11 insertions, 4 deletions
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 |