1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

Rename scripts/ to build-aux/

* scripts/: Rename to build-aux/
* Makefile.am: Adjust accordingly.
* configure.ac (AC_CONFIG_AUX_DIR): Change to build-aux.
This commit is contained in:
Werner Koch 2014-01-09 19:14:09 +01:00
parent a55ffb9da9
commit 99a48b2fcd
21 changed files with 73 additions and 73 deletions

View File

@ -23,11 +23,12 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
GITLOG_TO_CHANGELOG=gitlog-to-changelog GITLOG_TO_CHANGELOG=gitlog-to-changelog
EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \ EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh
ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \ ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011 \
scripts/gitlog-to-changelog \ build-aux/gitlog-to-changelog \
scripts/git-log-fix scripts/git-log-footer \ build-aux/git-log-fix build-aux/git-log-footer \
scripts/speedo.mk build-aux/speedo.mk README.GIT
DISTCLEANFILES = g10defs.h DISTCLEANFILES = g10defs.h
if BUILD_GPGSM if BUILD_GPGSM
@ -101,12 +102,12 @@ dist-hook: gen-ChangeLog
if HAVE_W32_SYSTEM if HAVE_W32_SYSTEM
install-data-hook: install-data-hook:
set -e; \ set -e; \
for i in $$($(top_srcdir)/scripts/potomo \ for i in $$($(top_srcdir)/build-aux/potomo \
--get-linguas $(top_srcdir)/po) ; do \ --get-linguas $(top_srcdir)/po) ; do \
$(MKDIR_P) "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES" || true; \ $(MKDIR_P) "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES" || true; \
rm -f "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" \ rm -f "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" \
2>/dev/null || true; \ 2>/dev/null || true; \
$(top_srcdir)/scripts/potomo $(top_srcdir)/po/$$i.po \ $(top_srcdir)/build-aux/potomo $(top_srcdir)/po/$$i.po \
"$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" ; \ "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" ; \
done done
endif endif
@ -118,9 +119,9 @@ gen-ChangeLog:
if test -d $(top_srcdir)/.git; then \ if test -d $(top_srcdir)/.git; then \
(cd $(top_srcdir) && \ (cd $(top_srcdir) && \
$(GITLOG_TO_CHANGELOG) --append-dot --tear-off \ $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
--amend=scripts/git-log-fix \ --amend=build-aux/git-log-fix \
--since=$(gen_start_date) ) > $(distdir)/cl-t; \ --since=$(gen_start_date) ) > $(distdir)/cl-t; \
cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t; \ cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t; \
rm -f $(distdir)/ChangeLog; \ rm -f $(distdir)/ChangeLog; \
mv $(distdir)/cl-t $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \
fi fi

View File

@ -84,4 +84,3 @@ echo ""
) | $SENDMAIL -oi "$addr" ) | $SENDMAIL -oi "$addr"
done done

View File

@ -63,7 +63,7 @@ PACKAGE=$PACKAGE_NAME
PACKAGE_GT=${PACKAGE_NAME}2 PACKAGE_GT=${PACKAGE_NAME}2
VERSION=$PACKAGE_VERSION VERSION=$PACKAGE_VERSION
AC_CONFIG_AUX_DIR([scripts]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([sm/gpgsm.c]) AC_CONFIG_SRCDIR([sm/gpgsm.c])
AC_CONFIG_HEADER([config.h]) AC_CONFIG_HEADER([config.h])
# Note: For automake 1.13 add the option # Note: For automake 1.13 add the option