3575d8b12b
tweaked by and ok aja
40 lines
1.4 KiB
Plaintext
40 lines
1.4 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
|
|
--- Makefile.orig Tue Mar 30 21:28:52 2010
|
|
+++ Makefile Tue Mar 30 21:35:58 2010
|
|
@@ -4,7 +4,7 @@ VER_MAJ := $(shell echo "${VERSION}" | cut -d '.'
|
|
VER_MIN := $(shell echo "${VERSION}" | cut -d '.' -f 2)
|
|
VER_REV := $(shell echo "${VERSION}" | cut -d '.' -f 3)
|
|
VER_REV := $(if ${VER_REV},${VER_REV},0)
|
|
-SVNREVISION := $(shell svn info | grep Revision | cut -d ' ' -f 2)
|
|
+#SVNREVISION := $(shell svn info | grep Revision | cut -d ' ' -f 2)
|
|
VER := $(shell echo "${VER_MAJ}.${VER_MIN}.${VER_REV}.${SVNREVISION}")
|
|
BUILDTIME := $(shell date "+%Y.%m.%d %H:%M")
|
|
DEB_BUILDTIME := $(shell date "+%a, %d %b %Y %H:%M:%S %z")
|
|
@@ -36,8 +36,8 @@ DEPS=$(LIBJS)
|
|
# Here are our default targets
|
|
#
|
|
.PHONY: release
|
|
-release: $(DEPS)
|
|
- make -f GNUmakefile debug=no
|
|
+release: libjs $(DEPS)
|
|
+ ${MAKE} -f GNUmakefile debug=no
|
|
|
|
.PHONY: release-snapshot
|
|
release-snapshot: $(DEPS)
|
|
@@ -47,13 +47,13 @@ release-snapshot: $(DEPS)
|
|
debug: $(DEPS)
|
|
make -f GNUmakefile debug=yes
|
|
|
|
-$(LIBJS):
|
|
+libjs:
|
|
ifeq ($(GNUSTEP_HOST_OS),mingw32)
|
|
@echo "ERROR - this Makefile can't (yet) build the Javascript DLL"
|
|
@echo " Please build it yourself and copy it to $(LIBJS)."
|
|
false
|
|
endif
|
|
- make -C $(LIBJS_SRC_DIR) -f Makefile.ref BUILD_OPT=1
|
|
+ ${MAKE} -C $(LIBJS_SRC_DIR) -f Makefile.ref BUILD_OPT=1
|
|
|
|
.PHONY: clean
|
|
clean:
|