diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-08 13:20:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-08 13:20:56 -0400 |
| commit | 1cfeca882ebbd2de350a62e97e7ace35d3a57644 (patch) | |
| tree | e6ca6b8ae85c643f1c4a59d9467e74fd4825c8a7 /src/libshared | |
| parent | 7f991fe569fc0562c9d67b3a473f9a4dda8dbc4d (diff) | |
fix
Diffstat (limited to 'src/libshared')
| -rw-r--r-- | src/libshared/Makefile | 2 | ||||
| -rw-r--r-- | src/libshared/src/Makefile | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 7ed2706100..d6a307fc5a 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src +nested.subdirs += src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libshared/src/Makefile b/src/libshared/src/Makefile index 08de6a2ef5..9ac9ba59ac 100644 --- a/src/libshared/src/Makefile +++ b/src/libshared/src/Makefile @@ -139,22 +139,22 @@ libshared_la_LIBADD = \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) -systemd.CPPFLAGS += $(addprefix -I,$(call at.path,$(srcdir)/../include $(srcdir)/../include/shared)) -systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" -systemd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" -systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" -systemd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" -systemd.CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" -systemd.CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" -systemd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" +sd.CPPFLAGS += $(addprefix -I,$(call at.path,$(srcdir)/../include $(srcdir)/../include/shared)) +sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +sd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" +sd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +sd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" +sd.CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" +sd.CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" +sd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" -systemd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(libexecdir)/systemd-fsck\" +sd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(libexecdir)/systemd-fsck\" -systemd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(bindir)/systemd-tty-ask-password-agent\" +sd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(bindir)/systemd-tty-ask-password-agent\" -systemd.CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" -systemd.CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" +sd.CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" +sd.CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" -systemd.CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" +sd.CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" include $(topsrcdir)/build-aux/Makefile.tail.mk |