diff options
| author | Josh Blum | 2011-09-22 12:51:09 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-09-22 12:51:09 -0700 |
| commit | 942fa1c2e226ac00ac8ac0d8ca1538f7015d0c5a (patch) | |
| tree | 26f36e48a5fe9a23afd310f952c217989292006e /volk/bootstrap | |
| parent | bb98061115a2c7299fb24ed90ba48786118bf32e (diff) | |
| parent | 4059269b4261c891923658a6faa0fa780888449b (diff) | |
| download | gnuradio-942fa1c2e226ac00ac8ac0d8ca1538f7015d0c5a.tar.gz gnuradio-942fa1c2e226ac00ac8ac0d8ca1538f7015d0c5a.tar.bz2 gnuradio-942fa1c2e226ac00ac8ac0d8ca1538f7015d0c5a.zip | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Conflicts:
gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h
volk/bootstrap
Diffstat (limited to 'volk/bootstrap')
| -rwxr-xr-x | volk/bootstrap | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/volk/bootstrap b/volk/bootstrap index 1afd49277..838f03aa2 100755 --- a/volk/bootstrap +++ b/volk/bootstrap @@ -23,8 +23,8 @@ rm -fr config.cache autom4te*.cache #alternative to -B that wont break on python 2.5 PYTHONDONTWRITEBYTECODE=1 export PYTHONDONTWRITEBYTECODE - python gen/volk_register.py + mv gen/lib/Makefile.am lib/ aclocal -I config -I gen/config |