diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-02-18 18:27:31 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-02-18 18:27:31 -0800 |
| commit | 1f9d14bec07092d62da29a5a233cefbf84d47289 (patch) | |
| tree | d0c2fa711d1539f053f805850a6ddd89654a86f1 | |
| parent | d3b0f267bd25ab888efc0417f62d525afa32208a (diff) | |
Use autoconf instead of sed to substitute @bindir@ in mkfontdir.in
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index c36d171..7bb11ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,13 +23,6 @@ SUBDIRS = man bin_PROGRAMS = mkfontscale bin_SCRIPTS = mkfontdir -CLEANFILES = $(bin_SCRIPTS) -EXTRA_DIST = $(bin_SCRIPTS:=.in) -DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g' - -mkfontdir: mkfontdir.in - $(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@ - AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE AM_CFLAGS = $(CWARNFLAGS) mkfontscale_LDADD = @MKFONTSCALE_LIBS@ @@ -66,4 +59,4 @@ lint: $(LINT) $(ALL_LINT_FLAGS) $(mkfontscale_SOURCES) endif LINT -EXTRA_DIST += README.md +EXTRA_DIST = README.md diff --git a/configure.ac b/configure.ac index ee427ed..1491157 100644 --- a/configure.ac +++ b/configure.ac @@ -63,5 +63,6 @@ XORG_WITH_LINT AC_CONFIG_FILES([ Makefile + mkfontdir man/Makefile]) AC_OUTPUT |