Commit 601bf86f authored by Philip Chimento's avatar Philip Chimento 🚮

build: Check for programs

This adds Autoconf's sanity checks to ln -s and sed.

https://bugzilla.gnome.org/show_bug.cgi?id=772027
parent 1fb999df
......@@ -13,7 +13,7 @@ endif
jsunit.test: installed-tests/jsunit.test.in Makefile
$(AM_V_GEN)$(MKDIR_P) $(@D) && \
sed -e s,@pkglibexecdir\@,$(pkglibexecdir), < $< > $@.tmp && mv $@.tmp $@
$(SED) -e s,@pkglibexecdir\@,$(pkglibexecdir), < $< > $@.tmp && mv $@.tmp $@
gjsinsttestdir = $(pkglibexecdir)/installed-tests
gjsinsttest_PROGRAMS =
......@@ -186,7 +186,7 @@ endif
%.test: installed-tests/scripts/%.js installed-tests/script.test.in Makefile
$(AM_V_GEN)$(MKDIR_P) $(@D) && \
sed -e s,@pkglibexecdir\@,$(pkglibexecdir), \
$(SED) -e s,@pkglibexecdir\@,$(pkglibexecdir), \
-e s,@name\@,$(notdir $<), \
< $(srcdir)/installed-tests/script.test.in > $@.tmp && \
mv $@.tmp $@
......
......@@ -198,7 +198,7 @@ EXTRA_DIST += $(tapset_in_files)
if ENABLE_SYSTEMTAP
gjs/gjs.stp: gjs/gjs.stp.in Makefile
$(AM_V_GEN)$(MKDIR_P) $(@D) && \
sed -e s,@EXPANDED_LIBDIR@,$(libdir), < $< > $@.tmp && mv $@.tmp $@
$(SED) -e s,@EXPANDED_LIBDIR@,$(libdir), < $< > $@.tmp && mv $@.tmp $@
tapsetdir = $(DESTDIR)$(datadir)/systemtap/tapset
tapset_DATA = $(tapset_in_files:.stp.in=.stp)
endif
......@@ -224,7 +224,7 @@ gjs_console_LDFLAGS = -rdynamic
gjs_console_SOURCES = gjs/console.cpp
install-exec-hook:
(cd $(DESTDIR)$(bindir) && ln -sf gjs-console$(EXEEXT) gjs$(EXEEXT))
(cd $(DESTDIR)$(bindir) && $(LN_S) -f gjs-console$(EXEEXT) gjs$(EXEEXT))
include Makefile-test.am
include Makefile-insttest.am
......@@ -249,7 +249,7 @@ COMPRESSION=.bz2
PACKAGE=@PACKAGE@
VERSION=@VERSION@
DISTNAME=$(PACKAGE)-$(VERSION).tar$(COMPRESSION)
TAG_VERSION := $(shell echo $(VERSION) |sed s/\\\./_/g)
TAG_VERSION := $(shell echo $(VERSION) | $(SED) s/\\\./_/g)
prepare-release-tag: Makefile
git tag -m "Tag $(TAG_VERSION)" -a $(TAG_PREFIX)$(TAG_VERSION)
......
......@@ -36,6 +36,8 @@ LT_INIT([disable-static])
# Other programs
AC_PROG_MKDIR_P
AC_PROG_LN_S
AC_PROG_SED
GNOME_CXX_WARNINGS([maximum])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment