13 files changed, 28 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am
index 5edfe15..1e56f8c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ SUBDIRS = . test
 include build-helpers/package-version.mk
 
 include Makefile-files
-include nbb/Makefile-files
+include src/Makefile-files
 
 if HAVE_NDIM_MAN2TXT
 .man.txt:
diff --git a/configure.ac b/configure.ac
index 793c02f..d841877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([ndims branch builder],
 	[hun@n-dimensional.de],
 	[nbb])
 AC_CONFIG_AUX_DIR([auto-aux])
-AC_CONFIG_SRCDIR([nbb/nbb.in])
+AC_CONFIG_SRCDIR([src/nbb.in])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_TESTDIR([test])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign 1.10 dist-bzip2
@@ -35,7 +35,7 @@ NDIM_DETECT_MAN2TXT()dnl
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([GNUmakefile])
-AC_CONFIG_FILES([nbb/nbblib/package.py:nbb/nbblib/package.in])
+AC_CONFIG_FILES([src/nbblib/package.py:src/nbblib/package.in])
 AC_CONFIG_FILES([test/atlocal])
 AC_CONFIG_FILES([test/Makefile])
 AC_OUTPUT
diff --git a/nbb/Makefile-files b/src/Makefile-files
index 5252ce5..6707adc 100644
--- a/nbb/Makefile-files
+++ b/src/Makefile-files
@@ -2,16 +2,16 @@
 
 if HAVE_PYTHON
 
-nodist_nbblib_PYTHON += nbb/nbblib/package.py
-CLEANFILES  += nbb/nbblib/package.py
+nodist_nbblib_PYTHON += src/nbblib/package.py
+CLEANFILES  += src/nbblib/package.py
 
-nbblib_PYTHON += nbb/nbblib/__init__.py
-nbblib_PYTHON += nbb/nbblib/bs.py
-nbblib_PYTHON += nbb/nbblib/commands.py
-nbblib_PYTHON += nbb/nbblib/main.py
-nbblib_PYTHON += nbb/nbblib/plugins.py
-nbblib_PYTHON += nbb/nbblib/progutils.py
-nbblib_PYTHON += nbb/nbblib/vcs.py
+nbblib_PYTHON += src/nbblib/__init__.py
+nbblib_PYTHON += src/nbblib/bs.py
+nbblib_PYTHON += src/nbblib/commands.py
+nbblib_PYTHON += src/nbblib/main.py
+nbblib_PYTHON += src/nbblib/plugins.py
+nbblib_PYTHON += src/nbblib/progutils.py
+nbblib_PYTHON += src/nbblib/vcs.py
 
 # Put all python source files, whether changed or verbatim,
 # into builddir, such that we can run tests in builddir.
@@ -24,34 +24,34 @@ all-local-nbblib:
 		fi; \
 	done
 
-bin_SCRIPTS += nbb/nbb
-CLEANFILES  += nbb/nbb
+bin_SCRIPTS += src/nbb
+CLEANFILES  += src/nbb
 
-# We cannot create nbb/nbb from nbb/nbb.in in configure.ac/config.status.
+# We cannot create src/nbb from src/nbb.in in configure.ac/config.status.
 # pythondir is defined as ${something}foobar, and that needs expansion.
-EXTRA_DIST += nbb/nbb.in
-nbb/nbb: nbb/nbb.in $(nodist_nbblib_PYTHON) $(nbblib_PYTHON) Makefile
+EXTRA_DIST += src/nbb.in
+src/nbb: src/nbb.in $(nodist_nbblib_PYTHON) $(nbblib_PYTHON) Makefile
 	$(SED) \
 		-e 's&[@]pythondir@&$(pythondir)&g' \
 		-e 's&[@]PYTHON@&$(PYTHON)&g' \
 		-e 's&[@]PACKAGE_VERSION@&$(PACKAGE_VERSION)&g' \
-		< $(srcdir)/nbb/nbb.in > nbb/nbb.new
-	@if test "x$$($(GREP) '@[a-zA-Z0-9_]\{1,\}@' nbb/nbb.new)" = "x"; then :; \
+		< $(srcdir)/src/nbb.in > src/nbb.new
+	@if test "x$$($(GREP) '@[a-zA-Z0-9_]\{1,\}@' src/nbb.new)" = "x"; then :; \
 	else \
-		echo "FATAL: Unsubstituted markers remain in nbb/nbb.new."; \
-		$(GREP) '@[a-zA-Z0-9_]\{1,\}@' nbb/nbb.new; \
+		echo "FATAL: Unsubstituted markers remain in src/nbb.new."; \
+		$(GREP) '@[a-zA-Z0-9_]\{1,\}@' src/nbb.new; \
 		exit 1; \
 	fi
-	@if test -f nbb/nbb && cmp nbb/nbb.new nbb/nbb; \
-	then rm -f nbb/nbb.new; \
-	else mv -f nbb/nbb.new nbb/nbb; echo "INFO: Updating nbb/nbb"; fi
-	@chmod +x nbb/nbb
+	@if test -f src/nbb && cmp src/nbb.new src/nbb; \
+	then rm -f src/nbb.new; \
+	else mv -f src/nbb.new src/nbb; echo "INFO: Updating src/nbb"; fi
+	@chmod +x src/nbb
 
 endif
 
 clean-local: clean-local-nbblib
 clean-local-nbblib:
-	rm -f nbb/nbblib/*.pyc
+	rm -f src/nbblib/*.pyc
 	@top_srcdir="$$(cd "$(top_srcdir)" > /dev/null 2>&1 && pwd)"; \
 	top_builddir="$$(cd "$(top_builddir)" > /dev/null 2>&1 && pwd)"; \
 	if test "x$${top_srcdir}" = "x$${top_builddir}"; then :; else \
diff --git a/nbb/nbb.in b/src/nbb.in
index ac2c2f0..ac2c2f0 100644
--- a/nbb/nbb.in
+++ b/src/nbb.in
diff --git a/nbb/nbblib/__init__.py b/src/nbblib/__init__.py
index d919ff1..d919ff1 100644
--- a/nbb/nbblib/__init__.py
+++ b/src/nbblib/__init__.py
diff --git a/nbb/nbblib/bs.py b/src/nbblib/bs.py
index cb498cb..cb498cb 100644
--- a/nbb/nbblib/bs.py
+++ b/src/nbblib/bs.py
diff --git a/nbb/nbblib/commands.py b/src/nbblib/commands.py
index 45e3a61..45e3a61 100644
--- a/nbb/nbblib/commands.py
+++ b/src/nbblib/commands.py
diff --git a/nbb/nbblib/main.py b/src/nbblib/main.py
index 3014355..3014355 100644
--- a/nbb/nbblib/main.py
+++ b/src/nbblib/main.py
diff --git a/nbb/nbblib/package.in b/src/nbblib/package.in
index 240bfd6..240bfd6 100644
--- a/nbb/nbblib/package.in
+++ b/src/nbblib/package.in
diff --git a/nbb/nbblib/plugins.py b/src/nbblib/plugins.py
index bd6839b..bd6839b 100644
--- a/nbb/nbblib/plugins.py
+++ b/src/nbblib/plugins.py
diff --git a/nbb/nbblib/progutils.py b/src/nbblib/progutils.py
index 456405e..456405e 100644
--- a/nbb/nbblib/progutils.py
+++ b/src/nbblib/progutils.py
diff --git a/nbb/nbblib/vcs.py b/src/nbblib/vcs.py
index b0aee5b..b0aee5b 100644
--- a/nbb/nbblib/vcs.py
+++ b/src/nbblib/vcs.py
diff --git a/test/Makefile.am b/test/Makefile.am
index 1961846..c481a46 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -32,8 +32,8 @@ git-version-check:
 check-local: git-version-check atconfig atlocal $(srcdir)/$(TESTSUITE)
 	abs_top_builddir="$$(cd "$(top_builddir)" > /dev/null 2>&1 && pwd)"; \
 	abs_top_srcdir="$$(cd "$(top_srcdir)" > /dev/null 2>&1 && pwd)"; \
-	$(SHELL) "$(srcdir)/$(TESTSUITE)" AUTOTEST_PATH=`cd $(top_builddir)/nbb > /dev/null && pwd` \
-		PYTHONPATH="$${abs_top_builddir}/nbb" \
+	$(SHELL) "$(srcdir)/$(TESTSUITE)" AUTOTEST_PATH=`cd $(top_builddir)/src > /dev/null && pwd` \
+		PYTHONPATH="$${abs_top_builddir}/src" \
 		$(TESTSUITEFLAGS)
 
 installcheck-local: atconfig atlocal $(srcdir)/$(TESTSUITE)