summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-07-07 21:39:42 -0500
committerDan McGee <dan@archlinux.org>2008-07-07 21:39:42 -0500
commitb196cc43a50e6fd1dfa9425d7ff8a9302e6fec84 (patch)
tree95fef101ad70aee43fd15e630357fa416652f3fa
parent30702350fa442fd6d450f909cda7124369e68f77 (diff)
parentd92b0e674d60e53a43fe9f6d5bc5f311364285c6 (diff)
Merge branch 'maint'
-rw-r--r--lib/libalpm/po/hu.po2
-rw-r--r--scripts/makepkg.sh.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index c9fd870a..90391466 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -139,7 +139,7 @@ msgstr "a(z) %s csomag saját %s függősége előtt lesz telepítve\n"
#, c-format
msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nem sikerült a(z) \"%s\" csomag \"%s\" függőségét feloldani\n"
+msgstr "nem sikerült a(z) \"%2$s\" csomag \"%1$s\" függőségét feloldani\n"
#, c-format
msgid "out of memory!"
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 4fa69455..b810d608 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -750,7 +750,7 @@ tidy_install() {
if [ "$(check_option libtool)" = "n" ]; then
msg2 "$(gettext "Removing libtool .la files...")"
- find . -type f -name "*.la" -exec rm -f -- '{}' \;
+ find . ! -type d -name "*.la" -exec rm -f -- '{}' \;
fi
if [ "$(check_option emptydirs)" = "n" ]; then