summaryrefslogtreecommitdiff
path: root/perl
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2006-06-25 01:35:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-03 00:14:42 (GMT)
commitd595a473ee628d0f88989d06871d9752caafa7e9 (patch)
treee06418029e09256d4e82c8d6bf0a41357cf9b1ac /perl
parent523bbaa4580a103b0994b5e3c71efcb1a8c6a7db (diff)
downloadgit-d595a473ee628d0f88989d06871d9752caafa7e9.zip
git-d595a473ee628d0f88989d06871d9752caafa7e9.tar.gz
git-d595a473ee628d0f88989d06871d9752caafa7e9.tar.bz2
Git.pm: assorted build related fixes.
- We passed our own *.a archives as LIBS to the submake that runs in perl/; separate LIBS and EXTLIBS and pass the latter which tells what the system libraries are used. - The quoting of preprocesor symbol definitions passed down to perl/ submake was loose and we lost double quotes around include directives. Use *_SQ to quote them properly. - The installation location of perl/ submake is not architecture neutral anymore, so use SITEARCH instead of SITELIB. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'perl')
-rw-r--r--perl/Git.xs5
-rw-r--r--perl/Makefile.PL2
2 files changed, 3 insertions, 4 deletions
diff --git a/perl/Git.xs b/perl/Git.xs
index 9d247b7..8b06ebf 100644
--- a/perl/Git.xs
+++ b/perl/Git.xs
@@ -29,7 +29,7 @@ report_xs(const char *prefix, const char *err, va_list params)
return buf;
}
-void
+static void NORETURN
die_xs(const char *err, va_list params)
{
char *str;
@@ -37,13 +37,12 @@ die_xs(const char *err, va_list params)
croak(str);
}
-int
+static void
error_xs(const char *err, va_list params)
{
char *str;
str = report_xs("error: ", err, params);
warn(str);
- return -1;
}
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 54e8b20..92c140d 100644
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -3,7 +3,7 @@ use ExtUtils::MakeMaker;
sub MY::postamble {
return <<'MAKE_FRAG';
instlibdir:
- @echo $(INSTALLSITELIB)
+ @echo $(INSTALLSITEARCH)
MAKE_FRAG
}