diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-07-21 17:49:51 -0700 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-07-21 17:49:51 -0700 |
| commit | 0eb7c07d8527a73cf2ab3896853da7a386d85545 (patch) | |
| tree | 028fb19f2da589fc056864adfdc412e6a42d5e6d | |
| parent | 7c16d375cbe99bde0a8a6d338f66fc236ce0cd19 (diff) | |
| parent | cd99e34adaad23a24b3333fe45d4267fef3a1eeb (diff) | |
| download | egawk-0eb7c07d8527a73cf2ab3896853da7a386d85545.tar.gz egawk-0eb7c07d8527a73cf2ab3896853da7a386d85545.tar.bz2 egawk-0eb7c07d8527a73cf2ab3896853da7a386d85545.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | extension/ChangeLog | 8 | ||||
| -rw-r--r-- | extension/Makefile.am | 2 | ||||
| -rw-r--r-- | extension/Makefile.in | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index f3a1c7a8..ab3d62c0 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,11 @@ +2014-06-13 Paul Gortmaker <paul.gortmaker@windriver.com> + + * Makefile.am (uninstall-so): Came across below bug while cross + compiling, and changed both install-data-hook and uninstall-so + to use $(DESTDIR) on v4.1.1 before seeing most of the fix in + gawk-4.1.1-3-g976f73ab0356; here we ensure uninstall-so also + uses the $(DESTDIR) prefix on its use of pkgextensiondir. + 2014-04-11 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (install-data-hook): Use $(DESTDIR) when removing diff --git a/extension/Makefile.am b/extension/Makefile.am index 11826e2b..b6beaee3 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -105,7 +105,7 @@ install-data-hook: # Keep the uninstall check working: uninstall-so: - $(RM) $(pkgextensiondir)/*.so + $(RM) $(DESTDIR)$(pkgextensiondir)/*.so uninstall-recursive: uninstall-so diff --git a/extension/Makefile.in b/extension/Makefile.in index d81b1696..294e4f88 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -1236,7 +1236,7 @@ install-data-hook: # Keep the uninstall check working: uninstall-so: - $(RM) $(pkgextensiondir)/*.so + $(RM) $(DESTDIR)$(pkgextensiondir)/*.so uninstall-recursive: uninstall-so |