Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac50
-rw-r--r--contrib/Makefile.am2
-rw-r--r--doc/Makefile.am1
-rw-r--r--etc/Makefile.am2
-rw-r--r--etc/abs/Makefile.am19
-rw-r--r--etc/pacman.d/Makefile.am3
-rw-r--r--lib/libalpm/Makefile.am2
-rw-r--r--pactest/Makefile.am2
-rw-r--r--scripts/Makefile.am4
-rw-r--r--src/pacman/Makefile.am6
-rw-r--r--src/util/Makefile.am2
12 files changed, 58 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am
index 700f32aa..3b8a0c35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,3 +12,4 @@ check-local: src/pacman
-p $(top_builddir)/src/pacman/pacman
rm -rf $(top_builddir)/root
+# vim:set ts=2 sw=2 noet:
diff --git a/configure.ac b/configure.ac
index 7312b7df..7b8de3ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,38 +30,38 @@ AC_DEFINE_UNQUOTED([LIB_VERSION], ["$LIB_VERSION"], [libalpm version number])
# Help line for root directory
AC_ARG_WITH(root-dir,
- AC_HELP_STRING([--with-root-dir=path], [set the location of pacman's root operating directory]),
- [ROOTDIR=$withval], [ROOTDIR=/])
+ AC_HELP_STRING([--with-root-dir=path], [set the location of pacman's root operating directory]),
+ [ROOTDIR=$withval], [ROOTDIR=/])
# Help line for package extension
AC_ARG_WITH(pkg-ext,
- AC_HELP_STRING([--with-pkg-ext=ext], [set the file extension used by packages]),
- [PKGEXT=$withval], [PKGEXT=.pkg.tar.gz])
+ AC_HELP_STRING([--with-pkg-ext=ext], [set the file extension used by packages]),
+ [PKGEXT=$withval], [PKGEXT=.pkg.tar.gz])
# Help line for source package directory
AC_ARG_WITH(src-ext,
- AC_HELP_STRING([--with-src-ext=ext], [set the file extension used by source packages]),
- [SRCEXT=$withval], [SRCEXT=.src.tar.gz])
+ AC_HELP_STRING([--with-src-ext=ext], [set the file extension used by source packages]),
+ [SRCEXT=$withval], [SRCEXT=.src.tar.gz])
# Help line for database extension
AC_ARG_WITH(db-ext,
- AC_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]),
- [DBEXT=$withval], [DBEXT=.db.tar.gz])
+ AC_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]),
+ [DBEXT=$withval], [DBEXT=.db.tar.gz])
# Help line for doxygen
AC_ARG_ENABLE(doxygen,
- AC_HELP_STRING([--disable-doxygen], [do not build API docs via Doxygen]),
- [wantdoxygen=$enableval], [wantdoxygen=yes])
+ AC_HELP_STRING([--disable-doxygen], [do not build API docs via Doxygen]),
+ [wantdoxygen=$enableval], [wantdoxygen=yes])
# Help line for debug
AC_ARG_ENABLE(debug,
- AC_HELP_STRING([--enable-debug], [enable debugging support]),
- [debug=$enableval], [debug=no])
+ AC_HELP_STRING([--enable-debug], [enable debugging support]),
+ [debug=$enableval], [debug=no])
# Help line for abs
AC_ARG_ENABLE(abs,
- AC_HELP_STRING([--disable-abs], [do not include Arch Linux Build System script]),
- [includeabs=$enableval], [includeabs=yes])
+ AC_HELP_STRING([--disable-abs], [do not include Arch Linux Build System script]),
+ [includeabs=$enableval], [includeabs=yes])
# Checks for programs.
AC_PROG_AWK
@@ -172,16 +172,16 @@ AC_SUBST(CHOST)
# Check for doxygen support
AC_MSG_CHECKING([for doxygen])
if test "x$wantdoxygen" = "xyes" ; then
- AC_CHECK_PROGS([DOXYGEN], [doxygen])
- if test $DOXYGEN ; then
+ AC_CHECK_PROGS([DOXYGEN], [doxygen])
+ if test $DOXYGEN ; then
AC_MSG_RESULT([yes])
usedoxygen=yes
- else
+ else
AC_MSG_RESULT([no, doxygen missing])
usedoxygen=no
- fi
+ fi
else
- AC_MSG_RESULT([no, disabled by configure])
+ AC_MSG_RESULT([no, disabled by configure])
usedoxygen=no
fi
AM_CONDITIONAL(HAS_DOXYGEN, test "x$usedoxygen" = "xyes")
@@ -192,19 +192,19 @@ if test "x$debug" = "xyes" ; then
AC_DEFINE([PACMAN_DEBUG], , [Enable debug code])
CFLAGS="$CFLAGS -g -Wall -Werror -fstack-protector -std=c99"
LDFLAGS="$LDFLAGS -lmcheck"
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT(yes)
else
CFLAGS="$CFLAGS -Wall -std=c99"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(no)
fi
# Enable or disable inclusion of abs script
AC_MSG_CHECKING(for inclusion of abs script)
if test "x$includeabs" = "xyes" ; then
- AC_DEFINE([INCLUDE_ABS], , [Include abs script])
- AC_MSG_RESULT(yes)
+ AC_DEFINE([INCLUDE_ABS], , [Include abs script])
+ AC_MSG_RESULT(yes)
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(no)
fi
AM_CONDITIONAL(INCLUDE_ABS, test "x$includeabs" = "xyes")
@@ -272,3 +272,5 @@ $PACKAGE_STRING:
debug support : ${debug}
include abs : ${includeabs}
"
+
+# vim:set ts=2 sw=2 noet:
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f78cdf8c..3ad85931 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -3,6 +3,8 @@ EXTRA_DIST = \
pacsearch \
pacdiff \
re-pacman \
+ wget-xdelta.sh \
zsh_completion \
README
+# vim:set ts=2 sw=2 noet:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f748ee6b..7a614795 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,3 +15,4 @@ EXTRA_DIST = $(man_MANS)
clean-local:
$(RM) man3/*.3
+# vim:set ts=2 sw=2 noet:
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 7ad9178e..2cff0150 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -32,3 +32,5 @@ $(dist_sysconf_DATA): Makefile
makepkg.conf: $(srcdir)/makepkg.conf.in
pacman.conf: $(srcdir)/pacman.conf.in
+
+# vim:set ts=2 sw=2 noet:
diff --git a/etc/abs/Makefile.am b/etc/abs/Makefile.am
index 69727e91..530540e0 100644
--- a/etc/abs/Makefile.am
+++ b/etc/abs/Makefile.am
@@ -1,17 +1,20 @@
-EXTRA_DIST = abs.conf \
- supfile.arch \
- supfile.community \
- supfile.extra \
- supfile.testing \
- supfile.unstable
+EXTRA_DIST = \
+ abs.conf \
+ supfile.arch \
+ supfile.community \
+ supfile.extra \
+ supfile.testing \
+ supfile.unstable
install-data-hook:
mkdir -p $(DESTDIR)$(sysconfdir)/abs ; \
for j in $(EXTRA_DIST); do \
- $(INSTALL) -c -m 644 $(srcdir)/$$j $(DESTDIR)$(sysconfdir)/abs/$$j ; \
+ $(INSTALL) -c -m 644 $(srcdir)/$$j $(DESTDIR)$(sysconfdir)/abs/$$j ; \
done
uninstall-hook:
for j in $(EXTRA_DIST); do \
- rm -f $(DESTDIR)$(sysconfdir)/abs/$$j ; \
+ rm -f $(DESTDIR)$(sysconfdir)/abs/$$j ; \
done
+
+# vim:set ts=2 sw=2 noet:
diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am
index f6f9051a..940282dc 100644
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -13,10 +13,11 @@ $(dist_pkgsysconf_DATA): Makefile
$(srcdir)/mirrorlist.in >$@.tmp
mv $@.tmp $@
-
community: $(srcdir)/mirrorlist.in
current: $(srcdir)/mirrorlist.in
extra: $(srcdir)/mirrorlist.in
release: $(srcdir)/mirrorlist.in
testing: $(srcdir)/mirrorlist.in
unstable: $(srcdir)/mirrorlist.in
+
+# vim:set ts=2 sw=2 noet:
diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index e3d6a188..2fb781eb 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -52,3 +52,5 @@ doxygen.in:
doxygen $(srcdir)/Doxyfile
endif
+
+# vim:set ts=2 sw=2 noet:
diff --git a/pactest/Makefile.am b/pactest/Makefile.am
index 37c394fd..879f23d0 100644
--- a/pactest/Makefile.am
+++ b/pactest/Makefile.am
@@ -17,3 +17,5 @@ EXTRA_DIST = \
TODO \
ChangeLog \
$(check_SCRIPTS)
+
+# vim:set ts=2 sw=2 noet:
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 8717c111..ba392fa9 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -37,7 +37,7 @@ edit = sed \
-e 's|@prefix[@]|$(prefix)|g' \
-e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
-e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \
- -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
+ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
-e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
## All the scripts depend on Makefile so that they are rebuilt when the
@@ -60,3 +60,5 @@ repo-add: $(srcdir)/repo-add.in
repo-remove: $(srcdir)/repo-remove.in
re-pacman: $(srcdir)/re-pacman.in
updatesync: $(srcdir)/updatesync.in
+
+# vim:set ts=2 sw=2 noet:
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index 3bccac22..6a7f4e43 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -26,9 +26,11 @@ pacman_SOURCES = \
util.h util.c
pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \
- -ldownload
+ -ldownload
pacman_static_SOURCES = $(pacman_SOURCES)
pacman_static_LDFLAGS = $(LDFLAGS) -all-static
pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \
- -ldownload
+ -ldownload
+
+# vim:set ts=2 sw=2 noet:
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 8174dd96..0c48f10e 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -9,3 +9,5 @@ vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
testpkg_SOURCES = testpkg.c
testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
+
+# vim:set ts=2 sw=2 noet:

Copyright © 2002-2022 Judd Vinet and Aaron Griffin. Copyright © 2022 Erich Eckner.
The Arch Linux name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.