Cleanup makefile

PackageInfo.g

@@ -5,11 +5,11 @@
 SetPackageInfo( rec(
 PackageName := "fr",
 Subtitle := "Computations with functionally recursive groups",
-Version := "2.3.2",
-Date := "23/02/2016",
+Version := "2.3.3",
+Date := "27/02/2016",
 ## <#GAPDoc Label="Version">
-## <!ENTITY Version "2.3.2">
-## <!ENTITY Date "23/02/2016">
+## <!ENTITY Version "2.3.3">
+## <!ENTITY Date "27/02/2016">
 ## <#/GAPDoc>
 ArchiveURL := Concatenation("https://github.com/gap-packages/fr/releases/download/v",~.Version,"/fr-",~.Version),
 ArchiveFormats := ".tar.gz",

cnf/Makefile.in

@@ -37,7 +37,7 @@ configure: cnf/Makefile.in cnf/configure.ac
 doc: doc/chap0.html
 
 doc/chap0.html: doc/fr.xml doc/frbib.xml gap/*.gd
-	echo 'LoadPackage("fr"); DOC@FR();' | @GAP_EXEC@ -q -T
+	@GAP_EXEC@ -q -T makedoc.g
 
 checkblocks:
 	grep '<#GAPDoc' PackageInfo.g gap/*d | awk -F'"' '{print $$2}' | sort > @@-blocks

configure

@@ -2103,13 +2103,9 @@ fi
 mkdir -p bin/$GAPARCH
 CONFIG_STATUS=bin/$GAPARCH/config.status
 
-ac_config_files="$ac_config_files $GAP_MAKEFILE:cnf/Makefile.in bin/$GAPARCH/files.g:cnf/files.g.in"
+ac_config_files="$ac_config_files Makefile:cnf/Makefile.in bin/$GAPARCH/files.g:cnf/files.g.in"
 
 
-if test "$GAP_MAKEFILE" != Makefile; then
-    ln -sf "$GAP_MAKEFILE" Makefile
-fi
-
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -2815,7 +2811,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "$GAP_MAKEFILE") CONFIG_FILES="$CONFIG_FILES $GAP_MAKEFILE:cnf/Makefile.in" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:cnf/Makefile.in" ;;
     "bin/$GAPARCH/files.g") CONFIG_FILES="$CONFIG_FILES bin/$GAPARCH/files.g:cnf/files.g.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;