summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-07-29 04:52:00 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-07-29 04:52:00 +0000
commit75efa17c93eb8aca76d38821e375e2088a468102 (patch)
tree6cd5dbfdbb6e435086d694ce6c50e79c1a85cea1
parentcc8452482c3c8441dbb5ad7114c4864ac6a85b0f (diff)
downloaddrakx-75efa17c93eb8aca76d38821e375e2088a468102.tar
drakx-75efa17c93eb8aca76d38821e375e2088a468102.tar.gz
drakx-75efa17c93eb8aca76d38821e375e2088a468102.tar.bz2
drakx-75efa17c93eb8aca76d38821e375e2088a468102.tar.xz
drakx-75efa17c93eb8aca76d38821e375e2088a468102.zip
always include all funcs (these're needed anyway by Move and GlobeTrotter)
-rw-r--r--perl-install/c/Makefile9
-rw-r--r--perl-install/c/stuff.xs.pl10
2 files changed, 8 insertions, 11 deletions
diff --git a/perl-install/c/Makefile b/perl-install/c/Makefile
index eba1a3cb0..0d09a8919 100644
--- a/perl-install/c/Makefile
+++ b/perl-install/c/Makefile
@@ -1,12 +1,9 @@
.PHONY: clean
-C_RPM = 1
-C_DRAKX = 1
-MYENV = C_RPM=$(C_RPM) C_DRAKX=$(C_DRAKX)
-MAKEIT = $(MYENV) $(MAKE) -f Makefile_c LD_RUN_PATH=
+MAKEIT = $(MAKE) -f Makefile_c LD_RUN_PATH=
stuff: %: %.xs
- test -e Makefile_c || $(MYENV) perl Makefile.PL
+ test -e Makefile_c || perl Makefile.PL
$(MAKEIT) || $(MAKEIT)
rm -f ../auto/c ; ln -s ../c/blib/arch/auto ../auto/c
@@ -16,5 +13,5 @@ clean:
stuff.xs: %: %.pl
rm -f $@
- C_RPM=$(C_RPM) C_DRAKX=$(C_DRAKX) perl $< > $@
+ perl $< > $@
chmod a-w $@
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index 8686497a0..68a339243 100644
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -73,11 +73,11 @@ char *promRootName();
';
-$ENV{C_DRAKX} && $Config{archname} =~ /i.86/ and print '
+$Config{archname} =~ /i.86/ and print '
char *pcmcia_probe(void);
';
-$ENV{C_RPM} and print '
+print '
#undef Fflush
#undef Mkdir
#undef Stat
@@ -95,7 +95,7 @@ void rpmError_callback(void) {
';
-$ENV{C_DRAKX} and print '
+print '
void log_message(const char * s, ...) {
va_list args;
@@ -158,7 +158,7 @@ MODULE = c::stuff PACKAGE = c::stuff
';
-$ENV{C_DRAKX} && $Config{archname} =~ /i.86/ and print '
+$Config{archname} =~ /i.86/ and print '
char *
pcmcia_probe()
';
@@ -720,7 +720,7 @@ get_iso_volume_ids(int fd)
';
-$ENV{C_RPM} and print '
+print '
const char *
rpmErrorString()