summary refs log tree commit diff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-09-15 01:04:32 +0200
committerMichael Biebl <biebl@debian.org>2018-09-15 01:04:32 +0200
commitc240974325c552cad177c457d6ff04e381fd77a3 (patch)
tree2fe5561359b767db15292c84447be8075a75388a /Makefile.am
parent8f7a3cbbdd0c0a48277c341dd3a8ec8743ae9735 (diff)
New upstream version 1.14.0 upstream/1.14.0
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index c1615108..5b0feefa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,9 +120,6 @@ config-extra.h: Makefile
 	echo "/* Generated by Makefile.am */"                    >$@ && \
 	echo "#define BINDIR            \"$(bindir)\""          >>$@ && \
 	echo "#define DATADIR           \"$(datadir)\""         >>$@ && \
-	echo "#define DHCLIENT_PATH     \"$(DHCLIENT_PATH)\""   >>$@ && \
-	echo "#define DHCPCANON_PATH    \"$(DHCPCANON_PATH)\""  >>$@ && \
-	echo "#define DHCPCD_PATH       \"$(DHCPCD_PATH)\""     >>$@ && \
 	echo "#define LIBEXECDIR        \"$(libexecdir)\""      >>$@ && \
 	echo "#define LOCALSTATEDIR     \"$(localstatedir)\""   >>$@ && \
 	echo "#define NMCONFDIR         \"$(nmconfdir)\""       >>$@ && \
@@ -1853,7 +1850,7 @@ $(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 ###############################################################################
 
 src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins)
-	$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)"
+	$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)"
 
 CLEANFILES += src/NetworkManager.ver
 
@@ -4749,6 +4746,7 @@ EXTRA_DIST += \
 	meson_options.txt \
 	meson_post_install.py \
 	config.h.meson \
+	config-extra.h.meson \
 	docs/meson.build \
 	\
 	po/meson.build \