diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-07-31 20:29:38 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-07-31 20:29:38 +0300 |
| commit | d60fb05cc5db4f1ee1176a9ed7f053011f8521aa (patch) | |
| tree | 2471e5d7757a3aad0f9fbf6722964a30ae1b01ee /extension | |
| parent | cafa8fcd5a5d593f4638b199fbf5f94a006a4aac (diff) | |
| parent | 54146e27c8fd7756a944d0e168aa969624567b55 (diff) | |
| download | egawk-d60fb05cc5db4f1ee1176a9ed7f053011f8521aa.tar.gz egawk-d60fb05cc5db4f1ee1176a9ed7f053011f8521aa.tar.bz2 egawk-d60fb05cc5db4f1ee1176a9ed7f053011f8521aa.zip | |
Merge branch 'master' into comment
Diffstat (limited to 'extension')
| -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 869c30a5..799b0121 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 |