emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] elpa c2fbb9c 01/35: Fix error in autogen.sh, configure, and Makef


From: Tassilo Horn
Subject: [elpa] elpa c2fbb9c 01/35: Fix error in autogen.sh, configure, and Makefile
Date: Sun, 31 Jan 2016 16:05:32 +0000

branch: elpa
commit c2fbb9ca83509d46141a55fca473215b176dc9c7
Author: Mosè Giordano <address@hidden>
Commit: Mosè Giordano <address@hidden>

    Fix error in autogen.sh, configure, and Makefile
    
    * Makefile.in (doc/Makefile): Replace ChangeLog with ChangeLog.1.
    * autogen.sh: Ditto.
    * configure.ac: Ditto.
    * doc/Makefile.in (version.texi): Ditto.
---
 Makefile.in     |    2 +-
 autogen.sh      |    6 +++---
 configure.ac    |    2 +-
 doc/Makefile.in |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 1b33ce6..25b9dba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -242,7 +242,7 @@ configure: configure.ac aclocal.m4
 Makefile: Makefile.in config.status
        ./config.status
 
-doc/Makefile: doc/Makefile.in config.status ChangeLog
+doc/Makefile: doc/Makefile.in config.status ChangeLog.1
        ./config.status
 
 config.status: configure
diff --git a/autogen.sh b/autogen.sh
index c61b534..6b2bd73 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,13 +32,13 @@ ${AUTOCONF} || { echo "Error running ${AUTOCONF} in ." >&2 
; exit 1; }
 rm -rf autom4te.cache
 if test "x${AUCTEXDATE}" = x
 then
-    AUCTEXDATE=`LC_ALL=C sed -n '1s/^\([-0-9][-0-9]*\).*/\1/p' ChangeLog`
-    test "X${AUCTEXDATE}" != X || { echo "Can't find date in ChangeLog" >&2 ; 
exit 1; }
+    AUCTEXDATE=`LC_ALL=C sed -n '1s/^\([-0-9][-0-9]*\).*/\1/p' ChangeLog.1`
+    test "X${AUCTEXDATE}" != X || { echo "Can't find date in ChangeLog.1" >&2 
; exit 1; }
 fi
 
 if test "x${AUCTEXVERSION}" = x
 then
-    AUCTEXVERSION=`sed -n '2,/^[0-9]/s/.*Version \(.*\) released\..*/\1/p' 
ChangeLog`
+    AUCTEXVERSION=`sed -n '2,/^[0-9]/s/.*Version \(.*\) released\..*/\1/p' 
ChangeLog.1`
     test "X${AUCTEXVERSION}" != X || AUCTEXVERSION=${AUCTEXDATE}
 fi
 
diff --git a/configure.ac b/configure.ac
index fd250db..c61f4c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_CHECK_PROGS_REQUIRED(MAKECMD, make, [make not found, 
aborting!])
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
-AC_DATE_VERSION_FROM_CHANGELOG(AUCTEXDATE,AUCTEXVERSION,ChangeLog)
+AC_DATE_VERSION_FROM_CHANGELOG(AUCTEXDATE,AUCTEXVERSION,ChangeLog.1)
 AC_SUBST(AUCTEXDATE)
 AC_SUBST(AUCTEXVERSION)
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 01e7e2a..6a37541 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -110,7 +110,7 @@ tex-ref.ps: tex-ref.dvi
 tex-ref.pdf: tex-ref.tex
        $(PDFTEX) tex-ref.tex
 
-version.texi: ../ChangeLog
+version.texi: ../ChangeLog.1
        echo @set VERSION $(AUCTEXVERSION) >version.texi
        echo @set UPDATED $(AUCTEXDATE) >>version.texi
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]