public
Created

Updated patch for AUR julia-git

  • Download Gist
0001_Makefile_Destdir.patch
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
--- julia/Makefile
+++ julia/Makefile
@@ -169,48 +169,48 @@ install:
@$(MAKE) $(QUIET_MAKE) release
@$(MAKE) $(QUIET_MAKE) debug
@for subdir in "bin" "libexec" $(JL_LIBDIR) $(JL_PRIVATE_LIBDIR) "share/julia" "share/man/man1" "include/julia" "share/julia/site/"$(VERSDIR) "etc/julia" ; do \
- mkdir -p $(PREFIX)/$$subdir ; \
+ mkdir -p $(DESTDIR)/$(PREFIX)/$$subdir ; \
done
- cp -a $(BUILD)/bin/julia* $(PREFIX)/bin/
+ cp -a $(BUILD)/bin/julia* $(DESTDIR)/$(PREFIX)/bin/
#-cp -a $(BUILD)/bin/llc$(EXE) $(PREFIX)/libexec # this needs libLLVM-3.3.$(SHLIB_EXT)
ifneq ($(OS),WINNT)
- cp -a $(BUILD)/libexec $(PREFIX)
- cd $(PREFIX)/bin && ln -sf julia-$(DEFAULT_REPL) julia
+ cp -a $(BUILD)/libexec $(DESTDIR)/$(PREFIX)
+ cd $(DESTDIR)/$(PREFIX)/bin && ln -sf julia-$(DEFAULT_REPL) julia
else
- cp -a $(BUILD)/bin/*.dll $(BUILD)/bin/*.bat $(PREFIX)/bin/
+ cp -a $(BUILD)/bin/*.dll $(BUILD)/bin/*.bat $(DESTDIR)/$(PREFIX)/bin/
endif
for suffix in $(JL_LIBS) ; do \
- cp -a $(BUILD)/$(JL_LIBDIR)/lib$${suffix}*.$(SHLIB_EXT)* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
+ cp -a $(BUILD)/$(JL_LIBDIR)/lib$${suffix}*.$(SHLIB_EXT)* $(DESTDIR)/$(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
done
for suffix in $(JL_PRIVATE_LIBS) ; do \
- cp -a $(BUILD)/$(JL_LIBDIR)/lib$${suffix}*.$(SHLIB_EXT)* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
+ cp -a $(BUILD)/$(JL_LIBDIR)/lib$${suffix}*.$(SHLIB_EXT)* $(DESTDIR)/$(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
done
ifeq ($(USE_SYSTEM_LIBUV),0)
ifeq ($(OS),WINNT)
- cp -a $(BUILD)/lib/libuv.a $(PREFIX)/$(JL_PRIVATE_LIBDIR)
- cp -a $(BUILD)/include/tree.h $(PREFIX)/include/julia
+ cp -a $(BUILD)/lib/libuv.a $(DESTDIR)/$(PREFIX)/$(JL_PRIVATE_LIBDIR)
+ cp -a $(BUILD)/include/tree.h $(DESTDIR)/$(PREFIX)/include/julia
else
- cp -a $(BUILD)/$(JL_LIBDIR)/libuv.a $(PREFIX)/$(JL_PRIVATE_LIBDIR)
+ cp -a $(BUILD)/$(JL_LIBDIR)/libuv.a $(DESTDIR)/$(PREFIX)/$(JL_PRIVATE_LIBDIR)
endif
- cp -a $(BUILD)/include/uv* $(PREFIX)/include/julia
+ cp -a $(BUILD)/include/uv* $(DESTDIR)/$(PREFIX)/include/julia
endif
- cp -a src/julia.h src/support/*.h $(PREFIX)/include/julia
+ cp -a src/julia.h src/support/*.h $(DESTDIR)/$(PREFIX)/include/julia
# Copy system image
- cp $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji $(PREFIX)/$(JL_PRIVATE_LIBDIR)
- cp $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.$(SHLIB_EXT) $(PREFIX)/$(JL_PRIVATE_LIBDIR)
+ cp $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji $(DESTDIR)/$(PREFIX)/$(JL_PRIVATE_LIBDIR)
+ cp $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.$(SHLIB_EXT) $(DESTDIR)/$(PREFIX)/$(JL_PRIVATE_LIBDIR)
# Copy in all .jl sources as well
- cp -R -L $(BUILD)/share/julia $(PREFIX)/share/
+ cp -R -L $(BUILD)/share/julia $(DESTDIR)/$(PREFIX)/share/
ifeq ($(OS), WINNT)
cp $(JULIAHOME)/contrib/windows/*.bat $(PREFIX)
endif
# Copy in beautiful new man page!
- cp $(BUILD)/share/man/man1/julia.1 $(PREFIX)/share/man/man1/
+ cp $(BUILD)/share/man/man1/julia.1 $(DESTDIR)/$(PREFIX)/share/man/man1/
# Copy etc/julia directory to SYSCONFIGDIR if it is set, otherwise to just $(PREFIX)/etc/
ifneq ($(SYSCONFDIR),)
- mkdir -p $(SYSCONFDIR)
- cp -R $(BUILD)/etc/julia $(SYSCONFDIR)/
+ mkdir -p $(DESTDIR)/$(SYSCONFDIR)
+ cp -R $(BUILD)/etc/julia $(DESTDIR)/$(SYSCONFDIR)/
else
- cp -R $(BUILD)/etc/julia $(PREFIX)/etc/
+ cp -R $(BUILD)/etc/julia $(DESTDIR)/$(PREFIX)/etc/
endif

Please sign in to comment on this gist.

Something went wrong with that request. Please try again.