diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-12-22 23:56:26 (EST) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2018-12-22 23:58:21 (EST) |
| commit | 9596d2f9c30d0e7a29952eed7e58ac0db42f7ef5 (patch) | |
| tree | cc683064a797490a536584a8399f12509259572c | |
| parent | d34d0df7747520cf6508a01340d9efa8a194895e (diff) | |
Makefile.am: Add variables to SHPPFLAGS
And drop from do_subst.
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index de6c6ad..dbefc5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,9 +35,13 @@ SUFFIXES = .sh .sho .1in .1 .3in .3 .ms SHOBJEXT = sho SHPPFLAGS = \ -DPKGLIBDIR="$(pkgdatadir)" \ + -DBINDIR="$(bindir)" \ + -DLIBDATADIR="$(libdatadir)" \ -DDATADIR="$(datadir)" \ -DLOCALEDIR="$(localedir)" \ -DSYSCONFDIR="$(sysconfdir)" \ + -DHELPERDIR="$(helperdir)" \ + -DOPKG="$(OPKG)" \ -DMETADATA="$(METADATA)" SHSOEXT = .shso LINK = printf "PACKAGE_VERSION='%s'\n" "$(PACKAGE_VERSION_GIT)" | \ @@ -80,16 +84,7 @@ EXTRA_DIST = \ do_subst = sed \ -e 's|@[@]PACKAGE_NAME[@]@|$(PACKAGE_NAME)|g' \ -e 's|@[@]PACKAGE_VERSION[@]@|$(PACKAGE_VERSION)|g' \ - -e 's|@[@]PACKAGE_DESCRIPTION[@]@|$(MANUAL)|g' \ - -e 's|@[@]BINDIR[@]@|$(bindir)|g' \ - -e 's|@[@]LIBDATADIR[@]@|$(libdatadir)|g' \ - -e 's|@[@]DATADIR[@]@|$(datadir)|g' \ - -e 's|@[@]LOCALEDIR[@]@|$(localedir)|g' \ - -e 's|@[@]SYSCONFDIR[@]@|$(sysconfdir)|g' \ - -e 's|@[@]HELPERDIR[@]@|$(helperdir)|g' \ - -e 's|@[@]SH[@]@|$(SH)|g' \ - -e 's|@[@]OPKG[@]@|$(OPKG)|g' \ - -e 's|@[@]METADATA[@]@|$(METADATA)|g' + -e 's|@[@]PACKAGE_DESCRIPTION[@]@|$(MANUAL)|g' all-local: $(locale_MESSAGES) |