diff options
| author | jbj <devnull@localhost> | 2002-01-23 00:58:47 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-01-23 00:58:47 +0000 |
| commit | 0bbb7bb94e340b22f584c9ebd8a1f667d68217bd (patch) | |
| tree | 816aac2f8f6e756054bc5e75c3cf9d231f47187e /Perl-RPM | |
| parent | c74fa2496545a34868e93ab830b304033781cde3 (diff) | |
| download | librpm-tizen-0bbb7bb94e340b22f584c9ebd8a1f667d68217bd.tar.gz librpm-tizen-0bbb7bb94e340b22f584c9ebd8a1f667d68217bd.tar.bz2 librpm-tizen-0bbb7bb94e340b22f584c9ebd8a1f667d68217bd.zip | |
- turn on auto-generated perl requirements (#58519, #58536, #58537).
Sanity.
CVS patchset: 5265
CVS date: 2002/01/23 00:58:47
Diffstat (limited to 'Perl-RPM')
| -rw-r--r-- | Perl-RPM/Makefile.PL | 17 | ||||
| -rw-r--r-- | Perl-RPM/RPM.h | 10 |
2 files changed, 17 insertions, 10 deletions
diff --git a/Perl-RPM/Makefile.PL b/Perl-RPM/Makefile.PL index c64659931..4820634a1 100644 --- a/Perl-RPM/Makefile.PL +++ b/Perl-RPM/Makefile.PL @@ -1,6 +1,6 @@ #!/bin/perl -# $Id: Makefile.PL,v 1.26 2002/01/10 19:16:54 jbj Exp $ +# $Id: Makefile.PL,v 1.27 2002/01/23 00:58:48 jbj Exp $ use Config; use ExtUtils::MakeMaker; @@ -84,16 +84,23 @@ else } # Check for needed header files -$rpm_libdir = ''; -for (qw(/usr/include /usr/local/include /opt/include /opt/rpm/include)) +if ( -d "../lib" ) { + $rpm_libdir = '.'; +} +else +{ + $rpm_libdir = ''; + for (qw(/usr/include /usr/local/include /opt/include /opt/rpm/include)) + { next unless -d $_ and -d "$_/rpm"; $rpm_libdir = "$_/rpm", last if (-d "$_/rpm" && -e "$_/rpm/rpmlib.h"); -} -die "Header file 'rpmlib.h' not found. This is needed for compiling the XS glue + } + die "Header file 'rpmlib.h' not found. This is needed for compiling the XS glue code. If this is present, edit $0 and add the correct directory to the search list near line 78. Stopped" unless $rpm_libdir; +} WriteMakefile( NAME => 'RPM', diff --git a/Perl-RPM/RPM.h b/Perl-RPM/RPM.h index c6d586920..8e629b5cf 100644 --- a/Perl-RPM/RPM.h +++ b/Perl-RPM/RPM.h @@ -1,5 +1,5 @@ /* - * $Id: RPM.h,v 1.16 2001/09/15 13:49:11 jbj Exp $ + * $Id: RPM.h,v 1.17 2002/01/23 00:58:48 jbj Exp $ * * Various C-specific decls/includes/etc. for the RPM linkage */ @@ -42,13 +42,13 @@ /* XXX Certain constants moved in rpm-4.0.3 to a developing CLI API */ #if RPM_MAJOR >= 4 && RPM_MINOR >= 0 && RPM_PATCH >= 3 -#include <rpm/rpmcli.h> +#include <rpmcli.h> #endif -#include <rpm/rpmlib.h> +#include <rpmlib.h> #if RPM_MAJOR < 4 -# include <rpm/header.h> -# include <rpm/dbindex.h> +# include <header.h> +# include <dbindex.h> #endif /* Various flags. For now, one nybble for header and one for package. */ |