projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
081bebd
)
Replace build-aux/ also in the Makefile snippet.
author
Bruno Haible
<bruno@clisp.org>
Mon, 13 Nov 2006 12:35:41 +0000
(12:35 +0000)
committer
Bruno Haible
<bruno@clisp.org>
Mon, 13 Nov 2006 12:35:41 +0000
(12:35 +0000)
ChangeLog
patch
|
blob
|
history
gnulib-tool
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
ec49c98
..
5609cfc
100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,5
+1,10
@@
2006-11-12 Bruno Haible <bruno@clisp.org>
2006-11-12 Bruno Haible <bruno@clisp.org>
+ * gnulib-tool (func_emit_lib_Makefile_am): Replace occurrences of
+ '$(top_srcdir)/build-aux/', taking into account the real auxdir.
+
+2006-11-12 Bruno Haible <bruno@clisp.org>
+
* gnulib-tool: New option --local-symlink.
(func_usage): Document it.
(lsymbolic): New variable.
* gnulib-tool: New option --local-symlink.
(func_usage): Document it.
(lsymbolic): New variable.
diff --git
a/gnulib-tool
b/gnulib-tool
index
a60e7f1
..
bebda19
100755
(executable)
--- a/
gnulib-tool
+++ b/
gnulib-tool
@@
-22,7
+22,7
@@
progname=$0
package=gnulib
progname=$0
package=gnulib
-cvsdatestamp='$Date: 2006-11-13 12:35:
0
1 $'
+cvsdatestamp='$Date: 2006-11-13 12:35:
4
1 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
nl='
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
nl='
@@
-1158,6
+1158,7
@@
func_modules_to_filelist ()
# - local_gnulib_dir from --local-dir
# - modules list of modules, including dependencies
# - libname library name
# - local_gnulib_dir from --local-dir
# - modules list of modules, including dependencies
# - libname library name
+# - auxdir directory relative to destdir where to place build aux files
# - makefile_name from --makefile-name
# - libtool true if libtool will be used, false or blank otherwise
# - macro_prefix prefix of gl_LIBOBJS macros to use
# - makefile_name from --makefile-name
# - libtool true if libtool will be used, false or blank otherwise
# - macro_prefix prefix of gl_LIBOBJS macros to use
@@
-1274,7
+1275,8
@@
func_emit_lib_Makefile_am ()
echo "AM_CPPFLAGS ="
fi
echo
echo "AM_CPPFLAGS ="
fi
echo
- cat allsnippets.tmp
+ cat allsnippets.tmp \
+ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g'
echo
echo "mostlyclean-local: mostlyclean-generic"
echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\"
echo
echo "mostlyclean-local: mostlyclean-generic"
echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\"