Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2022-08-10 16:33:51 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2022-08-10 16:33:51 +0200
commit69e1d614cd4ba34d3ed1e4386cb1c335b0cf5db7 (patch)
tree8e41946f9603f8c480163146044927404d9b33ed /Makefile
parent3c7d0b27036ef60cf5ad22397f4823d45687637b (diff)
parentb8d9a2b4fd02918a9988aafdf073e45a957b32e7 (diff)
Merge branch 'upstreamMaster' into abaaba
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 13 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ae59c7e..5ada6ba 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ IN_PROGS = \
checkpkg \
commitpkg \
crossrepomove\
+ diffpkg \
+ export-pkgbuild-keys \
finddeps \
find-libdeps \
lddd \
@@ -50,9 +52,13 @@ GENERATED_CONFIGFILES = \
CONFIGFILES = \
makepkg-x86_64.conf \
+ makepkg-x86_64_v3.conf \
pacman-extra.conf \
+ pacman-extra-x86_64_v3.conf \
pacman-testing.conf \
+ pacman-testing-x86_64_v3.conf \
pacman-staging.conf \
+ pacman-staging-x86_64_v3.conf \
pacman-multilib.conf \
pacman-multilib-testing.conf \
pacman-multilib-staging.conf \
@@ -61,6 +67,7 @@ CONFIGFILES = \
$(GENERATED_CONFIGFILES)
SETARCH_ALIASES = \
+ i486 \
pentium4
COMMITPKG_LINKS = \
@@ -116,9 +123,11 @@ BASHCOMPLETION_LINKS = \
MANS = \
doc/archbuild.1 \
doc/arch-nspawn.1 \
+ doc/export-pkgbuild-keys.1 \
doc/makechrootpkg.1 \
doc/lddd.1 \
doc/checkpkg.1 \
+ doc/diffpkg.1 \
doc/offload-build.1 \
doc/sogrep.1 \
doc/makerepropkg.1 \
@@ -200,8 +209,8 @@ install:
for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done
for l in ${CROSSREPOMOVE_LINKS}; do ln -sf crossrepomove $(DESTDIR)$(PREFIX)/bin/$$l; done
ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
- install -Dm0644 bash_completion $(DESTDIR)/usr/share/bash-completion/completions/devtools
- for l in ${BASHCOMPLETION_LINKS}; do ln -sf devtools $(DESTDIR)/usr/share/bash-completion/completions/$$l; done
+ install -Dm0644 bash_completion $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
+ for l in ${BASHCOMPLETION_LINKS}; do ln -sf devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
install -Dm0644 zsh_completion $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
ln -sf archco $(DESTDIR)$(PREFIX)/bin/communityco
for manfile in $(MANS); do \
@@ -215,7 +224,8 @@ uninstall:
for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
for l in ${CROSSREPOMOVE_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
- rm $(DESTDIR)/usr/share/bash-completion/completions/devtools
+ for l in ${BASHCOMPLETION_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
+ rm $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
rm -f $(DESTDIR)$(PREFIX)/bin/communityco
rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides