Mercurial > hg > octave-jordi
changeset 12163:55ebf5df9ea6
Use Automake and GNU Make variables for increased portability in DLD-FUNCTIONS/*.oct creation
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Tue, 25 Jan 2011 21:38:05 -0800 |
| parents | c9f42acd84e2 |
| children | 18e9a8da7d18 |
| files | src/ChangeLog src/DLD-FUNCTIONS/config-module.awk src/Makefile.am |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-01-25 Rik <octave@nomad.inbox5.com> + + * DLD-FUNCTIONS/config-module.awk: Use automake variable for + portability. + * Makefile.am (uninstall-oct): Use GNU Make features for portability + 2011-01-25 Rik <octave@nomad.inbox5.com> * DLD-FUNCTIONS/fft.cc, DLD-FUNCTIONS/fft2.cc, DLD-FUNCTIONS/fftn.cc,
--- a/src/DLD-FUNCTIONS/config-module.awk +++ b/src/DLD-FUNCTIONS/config-module.awk @@ -10,6 +10,7 @@ } { files[++nfiles] = $1; } END { + sep = " \\\n"; print "DLD_FUNCTIONS_SRC = \\"; for (i = 1; i <= nfiles; i++) { if (i == nfiles) @@ -31,7 +32,7 @@ for (i = 1; i <= nfiles; i++) { basename = files[i]; sub (/\.cc$/, "", basename); - printf ("DLD-FUNCTIONS/.%s.oct-stamp: DLD-FUNCTIONS/%s.la\n", basename, basename); + printf ("DLD-FUNCTIONS/$(am__leading_dot)%s.oct-stamp: DLD-FUNCTIONS/%s.la\n", basename, basename); print "\trm -f $(<:.la=.oct)"; print "\tla=$(<F) && \\"; print "\t of=$(<F:.la=.oct) && \\";
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -467,7 +467,7 @@ DLD_DYNAMIC_SRC = $(DLD_FUNCTIONS_SRC) DLD_STATIC_SRC = OCT_FILES = $(DLD_FUNCTIONS_LIBS:.la=.oct) - OCT_STAMP_FILES = $(subst DLD-FUNCTIONS/,DLD-FUNCTIONS/., $(DLD_FUNCTIONS_LIBS:.la=.oct-stamp)) + OCT_STAMP_FILES = $(subst DLD-FUNCTIONS/,DLD-FUNCTIONS/$(am__leading_dot),$(DLD_FUNCTIONS_LIBS:.la=.oct-stamp)) else DLD_DYNAMIC_SRC = DLD_STATIC_SRC = $(DLD_FUNCTIONS_SRC) @@ -720,8 +720,8 @@ done uninstall-oct: - for f in $(OCT_FILES); do \ - rm -f $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,.*/,,'`; \ + for f in $(notdir $(OCT_FILES)); do \ + rm -f $(DESTDIR)$(octfiledir)/$$f; \ done rm -f $(DESTDIR)$(octfiledir)/PKG_ADD endif