diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2000-03-21 19:17:05 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2000-03-21 19:17:05 +0000 |
| commit | 343464d1eb087b56659e568e1f4cc0c8a00cfdcc (patch) | |
| tree | dbc9d779a1fe922d2325a9dd67eb4c48e72b6e4f | |
| parent | fe77c97a5bc14263d4b49ee049fa2dc90ef2476b (diff) | |
| download | PROJ-343464d1eb087b56659e568e1f4cc0c8a00cfdcc.tar.gz PROJ-343464d1eb087b56659e568e1f4cc0c8a00cfdcc.zip | |
added man and nad support
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@796 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 3 |
4 files changed, 16 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index d24ab2a7..1c7fd8d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,3 @@ -SUBDIRS = src man +SUBDIRS = src man nad +AUTOMAKE_OPTIONS = dist-zip diff --git a/Makefile.in b/Makefile.in index e06aebeb..1dbc2543 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,7 +70,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ -SUBDIRS = src man +SUBDIRS = src man nad + +AUTOMAKE_OPTIONS = dist-zip ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ./src/proj_config.h @@ -220,9 +222,14 @@ dist: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) +dist-zip: distdir + -chmod -R a+r $(distdir) + zip -rq $(distdir).zip $(distdir) + -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) + zip -rq $(distdir).zip $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) @@ -1889,7 +1889,8 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile src/Makefile man/Makefile man/man1/Makefile man/man3/Makefile src/proj_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile src/Makefile man/Makefile man/man1/Makefile \ + man/man3/Makefile nad/Makefile src/proj_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -1988,7 +1989,8 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile man/Makefile man/man1/Makefile man/man3/Makefile"} +CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile man/Makefile man/man1/Makefile \ + man/man3/Makefile nad/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index 25ee24df..7c489bee 100644 --- a/configure.in +++ b/configure.in @@ -16,4 +16,5 @@ AC_CHECK_LIB(m,exp,,,) dnl We check for headers AC_HEADER_STDC -AC_OUTPUT(Makefile src/Makefile man/Makefile man/man1/Makefile man/man3/Makefile) +AC_OUTPUT(Makefile src/Makefile man/Makefile man/man1/Makefile \ + man/man3/Makefile nad/Makefile) |