summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Lord <phillip.lord@russet.org.uk>2016-12-12 21:18:57 +0000
committerPhillip Lord <phillip.lord@russet.org.uk>2016-12-12 21:18:57 +0000
commita54c71797ebc8afd3cef76ac19119e1c0e041bb0 (patch)
tree6b7934e5400fccec06c73c64be1f390b5deb56fc
parentdd2fd8a09e5ff1830777e523b8f6227602ebf6a0 (diff)
downloademacs-feature/manual-ldefs-rebased.tar.gz
Further changes to squashfeature/manual-ldefs-rebased
* admin/update_autogen: Alter mechanism for ldefs-boot generation.
-rwxr-xr-xadmin/update_autogen19
1 files changed, 10 insertions, 9 deletions
diff --git a/admin/update_autogen b/admin/update_autogen
index f27bfe0d148..98be4ed8fe0 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -92,7 +92,7 @@ changelog_flag=
## Parameters.
ldefs_in=lisp/loaddefs.el
-ldefs_out=lisp/ldefs-boot.el
+ldefs_boot=lisp/ldefs-boot.el
changelog_n=$(sed -n 's/CHANGELOG_HISTORY_INDEX_MAX *= *//p' Makefile.in)
changelog_files="ChangeLog.$changelog_n"
sources="configure.ac lib/Makefile.am"
@@ -370,19 +370,12 @@ echo "Running lisp/ make..."
make -C lisp "$@" autoloads EMACS=../src/bootstrap-emacs || die "make src error"
-
-## Ignore comment differences.
-[ ! "$lboot_flag" ] || \
- diff -q -I '^;' $ldefs_in $ldefs_out || \
- cp $ldefs_in $ldefs_out || die "cp ldefs_boot error"
-
-
echo "Checking status of loaddef files..."
## It probably would be fine to just check+commit lisp/, since
## making autoloads should not effect any other files. But better
## safe than sorry.
-modified=$(status $genfiles $ldefs_out) || die
+modified=$(status $genfiles) || die
commit "loaddefs" $modified || die "commit error"
@@ -396,6 +389,14 @@ commit "loaddefs" $modified || die "commit error"
}
+
+## Regenerate ldefs-boot if we are told to
+[ ! "$lboot_flag" ] || {
+ make generate-ldefs-boot || die
+ modified=$(status $ldefs_boot) || die
+ commit $ldefs_boot $modified || die "commit error"
+}
+
exit 0
### update_autogen ends here