Skip to content

Commit

Permalink
fix, PEBKAC, use YUCK as set by configure everywhere, fixes issue #128
Browse files Browse the repository at this point in the history
  • Loading branch information
hroptatyr committed Aug 4, 2021
1 parent 67acf97 commit 2820083
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ version.mk: .version version.mk.in
if test "$(MAKECMDGOALS)" != "am--refresh"; then \
$(MAKE) -C "$(top_builddir)/build-aux" $(MAKECMDGOALS); \
PATH="$(top_builddir)/build-aux:$${PATH}" \
yuck scmver --ignore-noscm -o $@ --reference $^; \
$(YUCK) scmver --ignore-noscm -o $@ --reference $^; \
if test $$? -eq 3 -a -n "$(_dist-target_p)"; then \
exec $(MAKE) $(MAKECMDGOALS); \
fi; \
Expand Down
6 changes: 3 additions & 3 deletions info/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ VPATH = $(srcdir):@top_srcdir@/src
SUFFIXES += .man
.yuck.man:
$(AM_V_GEN) PATH="$(top_builddir)/build-aux:$${PATH}" \
yuck$(EXEEXT) genman \
$(YUCK) genman \
--package "$(PACKAGE_NAME)" \
--info-page \
-i "$(builddir)/format.th2m" \
Expand All @@ -330,7 +330,7 @@ SUFFIXES += .man
SUFFIXES += .mand
.yuck.mand:
$(AM_V_GEN) PATH="$(top_builddir)/build-aux:$${PATH}" \
yuck$(EXEEXT) genman \
$(YUCK) genman \
--package "$(PACKAGE_NAME)" \
--info-page \
-i "$(builddir)/format.th2m" \
Expand All @@ -343,7 +343,7 @@ SUFFIXES += .mand
SUFFIXES += .manu
.yuck.manu:
$(AM_V_GEN) PATH="$(top_builddir)/build-aux:$${PATH}" \
yuck$(EXEEXT) genman \
$(YUCK) genman \
--package "$(PACKAGE_NAME)" \
--info-page \
-i "$(builddir)/format.th2m" \
Expand Down
4 changes: 2 additions & 2 deletions lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ SUFFIXES += .def
## version rules
version.c: version.c.in $(top_builddir)/.version
$(AM_V_GEN) PATH="$(top_builddir)/build-aux:$${PATH}" \
yuck$(EXEEXT) scmver --ignore-noscm --force -o $@ \
$(YUCK) scmver --ignore-noscm --force -o $@ \
--use-reference --reference $(top_builddir)/.version \
$(srcdir)/version.c.in

Expand All @@ -157,7 +157,7 @@ SUFFIXES += .yuck
SUFFIXES += .yucc
.yuck.yucc:
$(AM_V_GEN) PATH="$(top_builddir)/build-aux:$${PATH}" \
yuck$(EXEEXT) gen -o $@ $<
$(YUCK) gen -o $@ $<

## gperf rule
SUFFIXES += .gperf
Expand Down
6 changes: 4 additions & 2 deletions m4/yuck.m4
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,15 @@ instead of the system-wide one.])], [with_included_yuck="${withval}"], [with_inc
## see what m4 they used back then
YUCK_M4=`${YUCK} config --m4 2>/dev/null`
M4="${YUCK_M4-$M4}"
else
YUCK="yuck"
fi
else
AC_MSG_CHECKING([for yuck])
AC_MSG_RESULT([using included])
YUCK="${YUCK-yuck}"
fi
AM_CONDITIONAL([HAVE_YUCK], [dnl
test "${with_included_yuck}" = "no" -a -n "${YUCK}"])
AM_CONDITIONAL([HAVE_YUCK], [test "${with_included_yuck}" = "no"])
## further requirement is either getline() or fgetln()
AC_CHECK_FUNCS([getline])
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ SUFFIXES += .yuck
SUFFIXES += .yucc
.yuck.yucc:
$(AM_V_GEN) PATH=$(top_builddir)/build-aux:"$${PATH}" \
yuck$(EXEEXT) gen -o $@ $<
$(YUCK) gen -o $@ $<

## gperf rule
SUFFIXES += .gperf
Expand Down

0 comments on commit 2820083

Please sign in to comment.