diff options
| -rw-r--r-- | build-aux/Makefile.once.tail/20-systemd.mk | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/grp-boot/bootctl/Makefile | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/build-aux/Makefile.once.tail/20-systemd.mk b/build-aux/Makefile.once.tail/20-systemd.mk index 4e7aa4aa6e..5aa2703256 100644 --- a/build-aux/Makefile.once.tail/20-systemd.mk +++ b/build-aux/Makefile.once.tail/20-systemd.mk @@ -27,15 +27,11 @@ $(topsrcdir)/configure: $(topsrcdir)/configure.ac config_files = config.mk automake.mk autoconf.mk gnustandards.mk po/Makefile.in config_headers = config.h config_commands = depfiles libtool po/stamp-it -$(addprefix $(topoutdir)/,config.status $(config_files) $(config_headers)): $(topoutdir)/%: $(topoutdir)/%.stamp -$(topoutdir)/config.status.stamp: $(topsrcdir)/configure +$(topoutdir)/config.status: $(topsrcdir)/configure cd $(topoutdir) && ./config.status --recheck - test -f $(topoutdir)/$* - touch $@ -$(foreach f,$(config_files),$(topoutdir)/$f.stamp): $(topoutdir)/%.stamp: $(topoutdir)/config.status $(topsrcdir)/%.in +$(addprefix $(topoutdir)/,$(config_files)): $(topoutdir)/%: $(topoutdir)/config.status $(topsrcdir)/%.in cd $(topoutdir) && ./config.status --file=$* - test -f $(topoutdir)/$* - touch $@ +$(addprefix $(topoutdir)/,$(config_headers)): $(topoutdir)/%: $(topoutdir)/%.stamp $(foreach f,$(config_headers),$(topoutdir)/$f.stamp): $(topoutdir)/%.stamp: $(topoutdir)/config.status $(topsrcdir)/%.in cd $(topoutdir) && ./config.status --header=$* test -f $(topoutdir)/$* diff --git a/configure.ac b/configure.ac index 4e6f37f528..0d0c55a0d2 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_INIT([systemd], [systemd], [http://www.freedesktop.org/wiki/Software/systemd]) -AC_CONFIG_SRCDIR([src/system/systemd/main.c]) +AC_CONFIG_SRCDIR([src/grp-system/systemd/main.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index 9e6c221cb6..d01e6ea7d3 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(ENABLE_EFI),) |