diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2008-08-07 17:08:51 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2008-08-07 17:08:51 +0000 |
| commit | e87b213ec4e74c8569c54189ce61d213fc25fd95 (patch) | |
| tree | c2738e716f9a5aba62050e3198312462c62dd783 | |
| parent | b55e4ba6756d8384713ef4c23ea3e64f1ad30a67 (diff) | |
| download | PROJ-e87b213ec4e74c8569c54189ce61d213fc25fd95.tar.gz PROJ-e87b213ec4e74c8569c54189ce61d213fc25fd95.zip | |
make sure we use PROJ_LIB_DIR when installing files on windows
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1467 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nad/makefile.vc | 10 | ||||
| -rw-r--r-- | nmake.opt | 8 |
3 files changed, 14 insertions, 9 deletions
@@ -1,3 +1,8 @@ +2008-08-07 Frank Warmerdam <warmerdam@pobox.com> + + * nmake.opt, nad/makefile.vc: Make sure we use PROJ_LIB_DIR when + installing nad directory support files on windows. + 2008-07-28 IGNF <didier.richard@ign.fr> * PJ_glabsgm.c : refactoring for better understanding of the projection's diff --git a/nad/makefile.vc b/nad/makefile.vc index c17e2497..a87bb387 100644 --- a/nad/makefile.vc +++ b/nad/makefile.vc @@ -23,12 +23,12 @@ clean: -for %f in ( $(OLD_GRIDS) ) do del %f install-nadgrids: - for %f in ( $(OLD_GRIDS) ) do copy %f $(INSTDIR)\share + for %f in ( $(OLD_GRIDS) ) do copy %f $(PROJ_LIB_DIR) install-all: -mkdir $(INSTDIR) - -mkdir $(INSTDIR)\share - for %f in ( $(OTHER_FILES) ) do copy %f $(INSTDIR)\share + -mkdir $(PROJ_LIB_DIR) + for %f in ( $(OTHER_FILES) ) do copy %f $(PROJ_LIB_DIR) if exist conus $(MAKE) /f makefile.vc install-nadgrids - -copy *.gsb $(INSTDIR)\share - -copy ntv1_can.dat $(INSTDIR)\share + -copy *.gsb $(PROJ_LIB_DIR) + -copy ntv1_can.dat $(PROJ_LIB_DIR) @@ -1,3 +1,6 @@ +# Directory tree where PROJ will be installed. +INSTDIR=C:\PROJ + # # Set the following to the directory where the PROJ distribution # data files (ie, the contents of ..\NAD). The following assumes @@ -5,10 +8,7 @@ # be adjusted. It is also possible to leave this, and define the # PROJ_LIB environment variable to point to the NAD directory. # -PROJ_LIB_DIR=C:/PROJ/SHARE - -# Directory tree where PROJ will be installed. -INSTDIR=C:\PROJ +PROJ_LIB_DIR=$(INSTDIR)/SHARE # Uncomment the first for an optimized build, or the second for debug. OPTFLAGS= /nologo /Ox /MD |