[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10528 - in gnuradio/branches/developers/michaelld/fix
From: |
michaelld |
Subject: |
[Commit-gnuradio] r10528 - in gnuradio/branches/developers/michaelld/fix_local_data_install: . gnuradio-core/doc usrp/doc |
Date: |
Thu, 26 Feb 2009 12:11:59 -0700 (MST) |
Author: michaelld
Date: 2009-02-26 12:11:58 -0700 (Thu, 26 Feb 2009)
New Revision: 10528
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/configure.ac
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/doc/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
Log:
Check for in configure.ac, and use in Makefile.am's, MKDIR_P
(uppercase) instead of mkdir_p (lowercase).
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/configure.ac
===================================================================
--- gnuradio/branches/developers/michaelld/fix_local_data_install/configure.ac
2009-02-26 14:49:28 UTC (rev 10527)
+++ gnuradio/branches/developers/michaelld/fix_local_data_install/configure.ac
2009-02-26 19:11:58 UTC (rev 10528)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software
Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software
Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -82,6 +82,7 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+AC_PROG_MKDIR_P
AC_PATH_PROG([RM_PROG], [rm])
AC_LIBTOOL_WIN32_DLL
@@ -308,9 +309,10 @@
AC_SUBST([skipped_dirs], [$skipped_dirs])
AC_SUBST([with_dirs], [$with_dirs])
-# fix for older autotools that don't define "abs_top_YYY" by default
+# fix for older autotools that don't define these by default
AC_SUBST(abs_top_srcdir)
AC_SUBST(abs_top_builddir)
+AC_SUBST(MKDIR_P)
# 'with' variables - the pre-installed libraries, includes, and paths
# - must always come last in the lists, so they require special
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/doc/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/doc/Makefile.am
2009-02-26 14:49:28 UTC (rev 10527)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/doc/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
@@ -31,11 +31,11 @@
@DOXYGEN@
prep:
- $(mkdir_p) html
- $(mkdir_p) xml
+ $(MKDIR_P) html
+ $(MKDIR_P) xml
install-data-local:
- $(mkdir_p) $(DESTDIR)$(gr_docdir)
+ $(MKDIR_P) $(DESTDIR)$(gr_docdir)
cp -r html $(DESTDIR)$(gr_docdir)
cp -r xml $(DESTDIR)$(gr_docdir)
@@ -45,4 +45,3 @@
clean-local:
$(RM) -fr latex html man xml
-
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
2009-02-26 14:49:28 UTC (rev 10527)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/doc/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
@@ -48,7 +48,7 @@
dox: html/index.html
html/index.html:
- $(mkdir_p) html
+ $(MKDIR_P) html
@DOXYGEN@
docbook-html: usrp_guide.html
@@ -57,7 +57,7 @@
xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
install-data-local:
- $(mkdir_p) $(DESTDIR)$(usrp_docdir)/html
+ $(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
@for i in $(DOCBOOK_HTML_FILES); do \
echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10528 - in gnuradio/branches/developers/michaelld/fix_local_data_install: . gnuradio-core/doc usrp/doc,
michaelld <=