[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
68-install-in-install-am.patch
From: |
Akim Demaille |
Subject: |
68-install-in-install-am.patch |
Date: |
Sat, 24 Feb 2001 19:16:35 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
handle install and install-am.
* install.am: Do it.
* automake.in (&handle_merge_targets, &do_one_merge_target): Don't
Index: Makefile.in
--- Makefile.in Sat, 24 Feb 2001 16:41:07 +0100 akim (am/h/16_Makefile.i 1.21
644)
+++ Makefile.in Sat, 24 Feb 2001 16:52:55 +0100 akim (am/h/16_Makefile.i 1.21
644)
@@ -524,18 +524,19 @@
check: check-recursive
installcheck-am: installcheck-local
installcheck: installcheck-recursive
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir)
$(DESTDIR)$(pkgdatadir) $(DESTDIR)$(scriptdir)
+install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-uninstall: uninstall-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
Index: automake.in
--- automake.in Sat, 24 Feb 2001 16:41:07 +0100 akim (am/f/39_automake.i 1.75
755)
+++ automake.in Sat, 24 Feb 2001 16:51:37 +0100 akim (am/f/39_automake.i 1.75
755)
@@ -3609,8 +3609,6 @@ sub handle_merge_targets
$output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n";
}
# Print definitions users can use.
- &do_one_merge_target ('install', 'all-am');
-
&do_one_merge_target ('all', @all);
}
@@ -3644,13 +3642,6 @@ sub do_one_merge_target
{
&pretty_print_rule ("$name-am:", "\t\t", @values);
}
- if ($name eq 'install')
- {
- # Special-case `install-am' to run install-exec-am and
- # install-data-am after all-am is built.
- &pretty_print_rule ("address@hidden(MAKE) \$(AM_MAKEFLAGS)", "\t ",
- 'install-exec-am', 'install-data-am');
- }
# To understand this special case, see handle_merge_targets.
if ($name eq 'all')
Index: install.am
--- install.am Sat, 24 Feb 2001 16:41:07 +0100 akim (am/h/26_install.am 1.3 644)
+++ install.am Sat, 24 Feb 2001 16:52:51 +0100 akim (am/h/26_install.am 1.3 644)
@@ -36,16 +36,20 @@
.PHONY: install install-exec install-data uninstall
?SUBDIRS?.PHONY: install-recursive install-exec-recursive
install-data-recursive uninstall-recursive
-## FIXME: not ready: ?SUBDIRS?install: install-recursive
+?SUBDIRS?install: install-recursive
?SUBDIRS?install-exec: install-exec-recursive
?SUBDIRS?install-data: install-data-recursive
?SUBDIRS?uninstall: uninstall-recursive
-.PHONY: install-am install-exec-am install-data-am uninstall-am
-## FIXME: not ready: ?!SUBDIRS?install: install-am
+.PHONY: install-exec-am install-data-am uninstall-am
+?!SUBDIRS?install: install-am
?!SUBDIRS?install-exec: install-exec-am
?!SUBDIRS?install-data: install-data-am
?!SUBDIRS?uninstall: uninstall-am
+
+.PHONY: install-am
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
## We can't just set INSTALL_PROGRAM because that might be a relative
## path.
Index: m4/Makefile.in
--- m4/Makefile.in Sat, 24 Feb 2001 16:41:07 +0100 akim (am/h/15_Makefile.i
1.16 644)
+++ m4/Makefile.in Sat, 24 Feb 2001 16:52:57 +0100 akim (am/h/15_Makefile.i
1.16 644)
@@ -145,17 +145,18 @@
check: check-am
installcheck-am:
installcheck: installcheck-am
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
all-am: Makefile $(DATA)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(m4datadir)
+install: install-am
install-exec: install-exec-am
install-data: install-data-am
-uninstall: uninstall-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
Index: tests/Makefile.in
--- tests/Makefile.in Sat, 24 Feb 2001 16:41:07 +0100 akim (am/h/14_Makefile.i
1.18 644)
+++ tests/Makefile.in Sat, 24 Feb 2001 16:52:58 +0100 akim (am/h/14_Makefile.i
1.18 644)
@@ -448,16 +448,17 @@
check: check-am
installcheck-am:
installcheck: installcheck-am
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
all-am: Makefile
installdirs:
+install: install-am
install-exec: install-exec-am
install-data: install-data-am
-uninstall: uninstall-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
- 68-install-in-install-am.patch,
Akim Demaille <=