[Commit-gnuradio] r9365 - in gnuradio/branches/developers/jblum/grc: config grc/data grc/data/grc grc/data/grc_gnuradio grc/data/grc_gnuradio/blocks grc/src/grc grc/src/grc_gnuradio

[jblum]

Author: jblum
Date: 2008-08-21 15:42:26 -0600 (Thu, 21 Aug 2008)
New Revision: 9365

Modified:
   gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
   gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common
   gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am
   
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/Constants.py.in
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
Log:
makefile performs substitution

Modified: gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2008-08-21 
21:04:53 UTC (rev 9364)
+++ gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2008-08-21 
21:42:26 UTC (rev 9365)
@@ -43,26 +43,21 @@
             echo '*** GRC requirement "lxml" not found.'
             passed=no
         fi
+        if test $passed = no; then
+            echo '*** GRC will not be configured.'
+        fi
     fi
 
     dnl ########################################
-    dnl # platform dependency checks
+    dnl # platform dependency pythonw
     dnl ########################################
     if test `python -c "import sys; print sys.platform"` = 'darwin'; then
-        grc_gnuradio_pyexec=pythonw
+        PYTHONW=pythonw
     else
-        grc_gnuradio_pyexec=python
+        PYTHONW=python
     fi
+    AC_SUBST(PYTHONW)
 
-    dnl ########################################
-    dnl # substitution variables
-    dnl ########################################
-    grc_data_prefix=share/${PACKAGE}/grc dnl# cannot start with slash
-    AC_SUBST(grc_gnuradio_pyexec)
-    AC_SUBST(grc_data_dir, $grc_data_prefix/grc)
-    AC_SUBST(grc_gnuradio_data_dir, $grc_data_prefix/grc_gnuradio)
-    AC_SUBST(grc_gnuradio_blocks_dir, $grc_data_prefix/grc_gnuradio/blocks)
-
     AC_CONFIG_FILES([ \
         grc/src/grc/gui/elements/Makefile \
         grc/src/grc/gui/Makefile \
@@ -80,8 +75,6 @@
         grc/data/grc_gnuradio/Makefile \
         grc/scripts/Makefile \
         grc/Makefile \
-        grc/src/grc/Constants.py \
-        grc/src/grc_gnuradio/Constants.py \
     ])
 
     GRC_BUILD_CONDITIONAL(grc)

Modified: gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common     
2008-08-21 21:04:53 UTC (rev 9364)
+++ gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common     
2008-08-21 21:42:26 UTC (rev 9365)
@@ -21,6 +21,8 @@
 
 include $(top_srcdir)/Makefile.common
 
+grc_data_prefix = $(prefix)/share/${PACKAGE}/grc
+
 install-data-local:
        mkdir -p $(datadir)
        $(foreach file, $(EXTRA_DIST), \

Modified: gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am     
2008-08-21 21:04:53 UTC (rev 9364)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am     
2008-08-21 21:42:26 UTC (rev 9365)
@@ -21,8 +21,17 @@
 
 include ../Makefile.common
 
-datadir = $(prefix)/@grc_data_dir@
+datadir = $(grc_data_prefix)/grc
+gen_file = ../../src/grc/Constants.py
 
+all: $(gen_file)
+
+$(gen_file): Makefile $(gen_file).in
+       sed \
+               -e 's|@address@hidden|@VERSION@|g' \
+               -e 's|@address@hidden|$(datadir)|g' \
+       address@hidden > $@
+
 EXTRA_DIST = \
        block_tree.dtd \
        flow_graph.dtd \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am    
2008-08-21 21:04:53 UTC (rev 9364)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am    
2008-08-21 21:42:26 UTC (rev 9365)
@@ -23,8 +23,19 @@
 
 SUBDIRS = blocks
 
-datadir = $(prefix)/@grc_gnuradio_data_dir@
+datadir = $(grc_data_prefix)/grc_gnuradio
+docdir  = $(prefix)/share/doc/@address@hidden@VERSION@
+gen_file = ../../src/grc_gnuradio/Constants.py
 
+all: $(gen_file)
+
+$(gen_file): Makefile $(gen_file).in
+       sed \
+               -e 's|@address@hidden|$(PYTHONW)|g' \
+               -e 's|@address@hidden|$(datadir)|g' \
+               -e 's|@address@hidden|$(docdir)|g' \
+       address@hidden > $@
+
 EXTRA_DIST = \
        block.dtd \
        block_tree.xml \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am 
    2008-08-21 21:04:53 UTC (rev 9364)
+++ 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am 
    2008-08-21 21:42:26 UTC (rev 9365)
@@ -21,7 +21,7 @@
 
 include ../../Makefile.common
 
-datadir = $(prefix)/@grc_gnuradio_blocks_dir@
+datadir = $(grc_data_prefix)/grc_gnuradio/blocks
 
 EXTRA_DIST = \
        audio_sink.xml \

Modified: gnuradio/branches/developers/jblum/grc/grc/src/grc/Constants.py.in
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/Constants.py.in  
2008-08-21 21:04:53 UTC (rev 9364)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/Constants.py.in  
2008-08-21 21:42:26 UTC (rev 9365)
@@ -132,7 +132,7 @@
 
######################################################################################################
 
 ##Location of external data files.
-DATA_DIR = os.path.join('@prefix@', '@grc_data_dir@')
+DATA_DIR = '@datadir@'
 
 ##DTD validator for saved flow graphs.
 FLOW_GRAPH_DTD = os.path.join(DATA_DIR, 'flow_graph.dtd')

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in 
2008-08-21 21:04:53 UTC (rev 9364)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in 
2008-08-21 21:42:26 UTC (rev 9365)
@@ -24,12 +24,12 @@
 import sys
 import stat
 
-PYEXEC = '@grc_gnuradio_pyexec@'
+PYEXEC = '@PYTHONW@'
 
 #setup paths
-DOCS_DIR = os.path.join('@prefix@', 'share', 'doc', 
'@address@hidden@VERSION@', 'xml')
-DATA_DIR = os.path.join('@prefix@', '@grc_gnuradio_data_dir@')
-BLOCKS_DIR = os.path.join('@prefix@', '@grc_gnuradio_blocks_dir@')
+DOCS_DIR = os.path.join('@docdir@', 'xml')
+DATA_DIR = '@datadir@'
+BLOCKS_DIR = os.path.join(DATA_DIR, 'blocks')
 HIER_BLOCKS_LIB_DIR = os.path.join(os.path.expanduser('~'), '.grc_gnuradio')
 
 #file creation modes