diff options
author | Chris Cannam <cannam@all-day-breakfast.com> | 1998-11-18 22:35:29 +0000 |
---|---|---|
committer | Chris Cannam <cannam@all-day-breakfast.com> | 1998-11-18 22:35:29 +0000 |
commit | 4fad6cb78056b224b313f574ec690a67e977d349 (patch) | |
tree | e3f20ffd034f1a8c7a29526b89ecae31a788b91f /utils | |
parent | da615d2a4f32dc7fdb0f8ddf26090bd23fc59082 (diff) | |
download | alsa-lib-4fad6cb78056b224b313f574ec690a67e977d349.tar.gz |
Only install alsa.m4 if aclocal is present
Diffstat (limited to 'utils')
-rw-r--r-- | utils/Makefile.am | 2 | ||||
-rw-r--r-- | utils/Makefile.in | 41 |
2 files changed, 34 insertions, 9 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am index f4ef3e11..998f43c1 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,5 +1,7 @@ +if INSTALL_M4 aclocaldir=$(datadir)/aclocal aclocal_DATA=alsa.m4 +endif rpm: buildrpm alsa-lib.spec VERSION=$(VERSION) $(srcdir)/buildrpm diff --git a/utils/Makefile.in b/utils/Makefile.in index f6a6b798..1c1cdcd8 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -59,8 +59,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ CC = @CC@ LD = @LD@ LIBTOOL = @LIBTOOL@ @@ -71,10 +69,15 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ +@INSTALL_M4_TRUE@aclocaldir=$(datadir)/aclocal +@INSTALL_M4_TRUE@aclocal_DATA=alsa.m4 + INCLUDES=-I$(top_srcdir)/include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../include/config.h CONFIG_CLEAN_FILES = alsa-lib.spec +DATA = $(aclocal_DATA) + DIST_COMMON = Makefile.am Makefile.in alsa-lib.spec.in @@ -82,7 +85,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best -all: Makefile +all: Makefile $(DATA) .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) @@ -94,6 +97,25 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status alsa-lib.spec: $(top_builddir)/config.status alsa-lib.spec.in cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +install-aclocalDATA: $(aclocal_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(aclocaldir) + @list='$(aclocal_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(aclocaldir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(aclocaldir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(aclocaldir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(aclocaldir)/$$p; \ + fi; fi; \ + done + +uninstall-aclocalDATA: + @$(NORMAL_UNINSTALL) + list='$(aclocal_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(aclocaldir)/$$p; \ + done tags: TAGS TAGS: @@ -116,17 +138,18 @@ installcheck: install-exec: @$(NORMAL_INSTALL) -install-data: +install-data: install-aclocalDATA @$(NORMAL_INSTALL) install: install-exec install-data all @: -uninstall: +uninstall: uninstall-aclocalDATA install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: + $(mkinstalldirs) $(DESTDIR)$(aclocaldir) mostlyclean-generic: @@ -150,10 +173,10 @@ maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: tags distdir info dvi installcheck install-exec install-data \ -install uninstall all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +.PHONY: uninstall-aclocalDATA install-aclocalDATA tags distdir info dvi \ +installcheck install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean rpm: buildrpm alsa-lib.spec |