config: Use ${build_top} to change dir to parent.

On NetBSD with ksh changing into a symlink made PWD the link's
target path so a 'cd ..' returned you to that parent and not
the parent you started from. Record the build top and then
change back to that path.

Change the package names to the actual packages and remove the
extra directory in the build tree. This makes the paths simpler.

1 files changed, 11 insertions, 5 deletions

diff --git a/source-builder/config/autoconf-2-1.cfg b/source-builder/config/autoconf-2-1.cfg
index b187c4c..e322c70 100644
--- a/source-builder/config/autoconf-2-1.cfg
+++ b/source-builder/config/autoconf-2-1.cfg
@@ -25,12 +25,16 @@ VersionControl0: git clone git://git.sv.gnu.org/autoconf
 # Prepare the source code.
 #
 %prep
-  %setup -q -c -n %{name}-%{version}
-  cd autoconf-%{autoconf_version}
+  build_top=$(pwd)
+
+  %setup -q -n autoconf-%{autoconf_version}
   %{?patch0:%patch0 -p1}
-  cd ..
+
+  cd ${build_top}
 
 %build
+  build_top=$(pwd)
+
   %if %{defined _internal_autotools_path}
     export PATH="%{_internal_autotools_path}/bin:${PATH}"
   %endif
@@ -59,9 +63,11 @@ VersionControl0: git clone git://git.sv.gnu.org/autoconf
 
   unset CFLAGS_FOR_BUILD
 
-  cd ..
+  cd ${build_top}
 
 %install
+  build_top=$(pwd)
+
   export PATH="%{_bindir}:${PATH}"
   %{__rmdir} $SB_BUILD_ROOT
 
@@ -73,4 +79,4 @@ VersionControl0: git clone git://git.sv.gnu.org/autoconf
     %{__make} DESTDIR=$SB_BUILD_ROOT install
   fi
 
-  cd ..
+  cd ${build_top}