diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2000-03-27 15:36:31 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2000-03-27 15:36:31 +0000 |
| commit | d423218146de6b5523317e5a3dbac1a7759c47d6 (patch) | |
| tree | 56a81795ef85f7b525aae846e0874542d2840bbe /src | |
| parent | e68f2ec7dfaafe6dfaf8045f19b2a1f4005210b4 (diff) | |
| download | PROJ-d423218146de6b5523317e5a3dbac1a7759c47d6.tar.gz PROJ-d423218146de6b5523317e5a3dbac1a7759c47d6.zip | |
Ensure PROJ_LIB defined during build
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@809 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a1566975..9113f79b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,7 @@ bin_PROGRAMS = proj nad2nad nad2bin geod +INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" + include_HEADERS = projects.h proj_SOURCES = proj.c gen_cheb.c p_series.c emess.c emess.h diff --git a/src/Makefile.in b/src/Makefile.in index e5ffd898..ec144aed 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -62,9 +62,11 @@ host_triplet = @host@ AS = @AS@ CC = @CC@ DLLTOOL = @DLLTOOL@ +LD = @LD@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ +NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ @@ -72,6 +74,8 @@ VERSION = @VERSION@ bin_PROGRAMS = proj nad2nad nad2bin geod +INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" + include_HEADERS = projects.h proj_SOURCES = proj.c gen_cheb.c p_series.c emess.c emess.h @@ -149,7 +153,7 @@ proj_config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DEP_FILES = .deps/PJ_aea.P .deps/PJ_aeqd.P .deps/PJ_airy.P \ .deps/PJ_aitoff.P .deps/PJ_august.P .deps/PJ_bacon.P .deps/PJ_bipc.P \ @@ -384,7 +388,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ |