summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-04-15 19:07:51 -0500
committerDan McGee <dan@archlinux.org>2008-04-15 19:07:51 -0500
commitbf84c232664fdce4861a2b94ce895c2b160b355a (patch)
tree874eac1acbf4c6f83407a32493b5053d76c72158 /src
parentba70c52945c9e568100ca3a4eeb3ea1208d378ad (diff)
parent0d8affeac01f40470c50e22cf721bd7a9b12050a (diff)
downloadpacman-bf84c232664fdce4861a2b94ce895c2b160b355a.tar.xz
Merge branch 'maint'
Diffstat (limited to 'src')
-rw-r--r--src/pacman/.gitignore1
-rw-r--r--src/pacman/Makefile.am3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pacman/.gitignore b/src/pacman/.gitignore
index 61407057..c47851ce 100644
--- a/src/pacman/.gitignore
+++ b/src/pacman/.gitignore
@@ -3,3 +3,4 @@
pacman
pacman.exe
pacman.static
+pacman.static.exe
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index fbb50a29..5d6fef3c 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -33,10 +33,9 @@ pacman_SOURCES = \
upgrade.c \
util.h util.c
-pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
+LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la
pacman_static_SOURCES = $(pacman_SOURCES)
pacman_static_LDFLAGS = $(LDFLAGS) -all-static
-pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
# vim:set ts=2 sw=2 noet: