2023-08-16 22:26:55 +00:00
|
|
|
Use a date stamp for JANET_BUILD to avoid using git.
|
|
|
|
|
Fix installation.
|
|
|
|
|
|
|
|
|
|
Index: Makefile
|
|
|
|
|
--- Makefile.orig
|
|
|
|
|
+++ Makefile
|
|
|
|
|
@@ -28,7 +28,7 @@ JANETCONF_HEADER?=src/conf/janetconf.h
|
|
|
|
|
INCLUDEDIR?=$(PREFIX)/include
|
|
|
|
|
BINDIR?=$(PREFIX)/bin
|
|
|
|
|
LIBDIR?=$(PREFIX)/lib
|
|
|
|
|
-JANET_BUILD?="\"$(shell git log --pretty=format:'%h' -n 1 2> /dev/null || echo local)\""
|
|
|
|
|
+JANET_BUILD?="\"$(shell date +%Y%m%d)\""
|
|
|
|
|
CLIBS=-lm -lpthread
|
|
|
|
|
JANET_TARGET=build/janet
|
|
|
|
|
JANET_BOOT=build/janet_boot
|
|
|
|
|
@@ -36,7 +36,7 @@ JANET_IMPORT_LIB=build/janet.lib
|
|
|
|
|
JANET_LIBRARY=build/libjanet.so
|
|
|
|
|
JANET_STATIC_LIBRARY=build/libjanet.a
|
|
|
|
|
JANET_PATH?=$(LIBDIR)/janet
|
|
|
|
|
-JANET_MANPATH?=$(PREFIX)/share/man/man1/
|
|
|
|
|
+JANET_MANPATH?=$(PREFIX)/man/man1/
|
|
|
|
|
JANET_PKG_CONFIG_PATH?=$(LIBDIR)/pkgconfig
|
|
|
|
|
JANET_DIST_DIR?=janet-dist
|
|
|
|
|
JANET_BOOT_FLAGS:=. JANET_PATH '$(JANET_PATH)'
|
2023-09-20 05:43:08 +00:00
|
|
|
@@ -313,7 +313,7 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT
|
|
|
|
|
strip -x -S '$(DESTDIR)$(BINDIR)/janet'
|
2023-08-16 22:26:55 +00:00
|
|
|
mkdir -p '$(DESTDIR)$(INCLUDEDIR)/janet'
|
|
|
|
|
cp -r build/janet.h '$(DESTDIR)$(INCLUDEDIR)/janet'
|
|
|
|
|
- ln -sf ./janet/janet.h '$(DESTDIR)$(INCLUDEDIR)/janet.h'
|
|
|
|
|
+ cp -r '$(DESTDIR)$(INCLUDEDIR)/janet/janet.h' '$(DESTDIR)$(INCLUDEDIR)/janet.h'
|
|
|
|
|
mkdir -p '$(DESTDIR)$(JANET_PATH)'
|
|
|
|
|
mkdir -p '$(DESTDIR)$(LIBDIR)'
|
|
|
|
|
if test $(UNAME) = Darwin ; then \
|
2023-09-20 05:43:08 +00:00
|
|
|
@@ -321,9 +321,7 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT
|
2023-08-16 22:26:55 +00:00
|
|
|
ln -sf $(SONAME) '$(DESTDIR)$(LIBDIR)/libjanet.dylib' ; \
|
|
|
|
|
ln -sf libjanet.$(shell $(JANET_TARGET) -e '(print janet/version)').dylib $(DESTDIR)$(LIBDIR)/$(SONAME) ; \
|
|
|
|
|
else \
|
|
|
|
|
- cp $(JANET_LIBRARY) '$(DESTDIR)$(LIBDIR)/libjanet.so.$(shell $(JANET_TARGET) -e '(print janet/version)')' ; \
|
|
|
|
|
- ln -sf $(SONAME) '$(DESTDIR)$(LIBDIR)/libjanet.so' ; \
|
|
|
|
|
- ln -sf libjanet.so.$(shell $(JANET_TARGET) -e '(print janet/version)') $(DESTDIR)$(LIBDIR)/$(SONAME) ; \
|
|
|
|
|
+ cp $(JANET_LIBRARY) '$(DESTDIR)$(LIBDIR)/' ; \
|
|
|
|
|
fi
|
|
|
|
|
cp $(JANET_STATIC_LIBRARY) '$(DESTDIR)$(LIBDIR)/libjanet.a'
|
|
|
|
|
mkdir -p '$(DESTDIR)$(JANET_MANPATH)'
|
2023-09-20 05:43:08 +00:00
|
|
|
@@ -331,7 +329,6 @@ install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STAT
|
2023-08-16 22:26:55 +00:00
|
|
|
mkdir -p '$(DESTDIR)$(JANET_PKG_CONFIG_PATH)'
|
|
|
|
|
cp build/janet.pc '$(DESTDIR)$(JANET_PKG_CONFIG_PATH)/janet.pc'
|
|
|
|
|
cp '$(JANET_IMPORT_LIB)' '$(DESTDIR)$(LIBDIR)' || echo 'no import lib to install (mingw only)'
|
|
|
|
|
- [ -z '$(DESTDIR)' ] && $(LDCONFIG) || echo "You can ignore this error for non-Linux systems or local installs"
|
|
|
|
|
|
|
|
|
|
install-jpm-git: $(JANET_TARGET)
|
|
|
|
|
mkdir -p build
|
