]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
configure strips out VPATH. Use ${srcdir} instead so 'make depend' works
authorMark Andrews <marka@isc.org>
Tue, 20 Dec 2011 05:24:18 +0000 (05:24 +0000)
committerMark Andrews <marka@isc.org>
Tue, 20 Dec 2011 05:24:18 +0000 (05:24 +0000)
in lib/export.

make/rules.in

index 7992d682ce7abfc9dbe5cb98b87ebfa42418cde8..c736967845f657a0c09f40df06ba49971cadcbd0 100644 (file)
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.71 2011/09/02 21:15:39 each Exp $
+# $Id: rules.in,v 1.72 2011/12/20 05:24:18 marka Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -236,20 +236,20 @@ depend:
                        (cd $$i; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@) || exit 1; \
                fi; \
        done
-       @if [ X"${VPATH}" != X ] ; then \
+       @if [ X"${srcdir}" != X. ] ; then \
                if [ X"${SRCS}" != X -a X"${PSRCS}" != X ] ; then \
-                       echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
-                       ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
-                       echo ${MKDEP} -vpath ${VPATH} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
-                       ${MKDEP} -vpath ${VPATH} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
+                       echo ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+                       ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+                       echo ${MKDEP} -vpath ${srcdir} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
+                       ${MKDEP} -vpath ${srcdir} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
                        ${DEPENDEXTRA} \
                elif [ X"${SRCS}" != X ] ; then \
-                       echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
-                       ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+                       echo ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
+                       ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \
                        ${DEPENDEXTRA} \
                elif [ X"${PSRCS}" != X ] ; then \
-                       echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
-                       ${MKDEP} -vpath ${VPATH} -p ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
+                       echo ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
+                       ${MKDEP} -vpath ${srcdir} -p ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \
                        ${DEPENDEXTRA} \
                fi \
        else \