From f0372e6595dadb444092986f13d529e4dab34e08 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 18 Jan 2012 16:19:14 +0530 Subject: [PATCH] Add libgrisu to the install target. Update the Makefile's install target to not use rm, cp, etc. and instead use the install command. The default install path is $(DESTDIR)/usr/share/julia. In case DESTDIR is not specified during make, the installation happens in /usr/share/julia. I would have liked this to be /usr/local/julia instead, but the debian package creation scripts do not like this, and it calls the install target in the Makefile to create the package. I think /usr/share/julia is acceptable as a default for the time being. I believe this sufficiently addresses issue #6 even though the solution is not completely satisfactory. --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6a53f783ed2b1..0b92789cac1fe 100644 --- a/Makefile +++ b/Makefile @@ -17,14 +17,15 @@ sys.ji: VERSION j/sysimg.j j/start_image.j src/boot.j src/dump.c j/*.j $(QUIET_JULIA) ./julia -b stage0.j install: release - rm -fr $(DESTDIR)/* - mkdir -p $(DESTDIR)/usr/share/julia/lib - cp -a julia* $(DESTDIR)/usr/share/julia - cp -a lib/libarpack.$(SHLIB_EXT) lib/libfdm.$(SHLIB_EXT) lib/libfftw3.$(SHLIB_EXT)* lib/libfftw3f.$(SHLIB_EXT)* lib/libpcre.$(SHLIB_EXT)* lib/libpcrecpp.$(SHLIB_EXT)* lib/libpcreposix.$(SHLIB_EXT)* lib/librandom.$(SHLIB_EXT) lib/liblapack.$(SHLIB_EXT) lib/libsuitesparse* $(DESTDIR)/usr/share/julia/lib - cp -r j $(DESTDIR)/usr/share/julia - cp -r contrib $(DESTDIR)/usr/share/julia - cp -r examples $(DESTDIR)/usr/share/julia - cp -r sys.ji $(DESTDIR)/usr/share/julia + install -d $(DESTDIR)/usr/share/julia/lib + install -d $(DESTDIR)/usr/share/julia/j + install -d $(DESTDIR)/usr/share/julia/contrib + install -d $(DESTDIR)/usr/share/julia/examples + install -v -C julia* $(DESTDIR)/usr/share/julia + install -v -C sys.ji $(DESTDIR)/usr/share/julia + install -v -C j/* $(DESTDIR)/usr/share/julia/j + install -v -C examples/* $(DESTDIR)/usr/share/julia/examples + install -v -C lib/libarpack.$(SHLIB_EXT) lib/libfdm.$(SHLIB_EXT) lib/libfftw3.$(SHLIB_EXT)* lib/libfftw3f.$(SHLIB_EXT)* lib/libpcre.$(SHLIB_EXT)* lib/libpcrecpp.$(SHLIB_EXT)* lib/libpcreposix.$(SHLIB_EXT)* lib/librandom.$(SHLIB_EXT) lib/liblapack.$(SHLIB_EXT) lib/libsuitesparse.$(SHLIB_EXT) lib/libgrisu.$(SHLIB_EXT) $(DESTDIR)/usr/share/julia/lib deb: fakeroot debian/rules binary