]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
build: fix srcdir detection when VPATH build
authorDaiki Ueno <dueno@redhat.com>
Sat, 24 Nov 2018 14:57:11 +0000 (15:57 +0100)
committerDaiki Ueno <dueno@redhat.com>
Sat, 24 Nov 2018 16:02:46 +0000 (17:02 +0100)
Unlike the ".c.c.bak:" and ".h.h.bak:" rules, ".def.stamp:" needs this
adjustment because the source files (*.bak) are not provided as $<.

Signed-off-by: Daiki Ueno <dueno@redhat.com>
src/Makefile.am

index 23f8936bf004f8f3c862392decf75c70ff25ff8a..9d0af9aae2c3e32269088f382fe8fa991ee8bf4a 100644 (file)
@@ -269,22 +269,18 @@ SUFFIXES = .stamp .def .c.bak .h.bak
 .def.stamp:
        $(AM_V_GEN) $(AUTOGEN) $< || { \
                srcdir=''; \
-               test -f ./$@ || srcdir=$(srcdir)/; \
                b=`echo $@ | sed 's/.stamp$$//'`; \
+               test -f ./$${b}.def || srcdir=$(srcdir)/; \
                cp -p $${srcdir}$${b}.c.bak $${b}.c; \
                cp -p $${srcdir}$${b}.h.bak $${b}.h; \
        } && \
        touch $@
 
 .c.c.bak:
-       $(AM_V_GEN) srcdir=''; \
-               test -f ./$@ || srcdir=$(srcdir)/; \
-               test -f $${srcdir}/$@ || cp -p $< $@
+       $(AM_V_GEN) cp -p $< $@
 
 .h.h.bak:
-       $(AM_V_GEN) srcdir=''; \
-               test -f ./$@ || srcdir=$(srcdir)/; \
-               test -f $${srcdir}/$@ || cp -p $< $@
+       $(AM_V_GEN) cp -p $< $@
 
 danetool-args.h: danetool-args.stamp
 danetool-args.c: danetool-args.stamp