diff --git a/Makefile.PL b/Makefile.PL index f862eaa..22a3500 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -22,11 +22,11 @@ extra_build: perl -i -pe "s/\@version\@/$(VER)/g" alien.spec extra_install: - install -d $(PREFIX)/usr/share/alien/patches \ - $(PREFIX)/var/lib/alien - cp -f patches/*.diff $(PREFIX)/usr/share/alien/patches/ - -rm -f $(PREFIX)/usr/share/alien/patches/*.gz - gzip -qf9 $(PREFIX)/usr/share/alien/patches/* + install -d $(PREFIX)/share/alien/patches \ + $(VARPREFIX)/var/lib/alien + cp -f patches/*.diff $(PREFIX)/share/alien/patches/ + -rm -f $(PREFIX)/share/alien/patches/*.gz + gzip -qf9 $(PREFIX)/share/alien/patches/* alien: perl -pe ' \ diff --git a/alien.spec.in b/alien.spec.in index 244cc85..ae294ff 100644 --- a/alien.spec.in +++ b/alien.spec.in @@ -24,11 +24,12 @@ rm -r /tmp/alien-@version@.build || true %install perl Makefile.PL make -make pure_install PREFIX=$RPM_BUILD_ROOT INSTALLDIRS=perl \ - INSTALLMAN1DIR=$RPM_BUILD_ROOT/usr/share/man/man1 \ - INSTALLMAN3DIR=$RPM_BUILD_ROOT/usr/share/man/man3 \ - INSTALLSCRIPT=$RPM_BUILD_ROOT/usr/bin \ - INSTALLARCHLIB=$RPM_BUILD_ROOT/killme +make pure_install INSTALLDIRS=perl \ + PREFIX=$RPM_BUILD_ROOT/`perl -e 'use Config;print $Config{prefix}'` \ + INSTALLMAN1DIR=$RPM_BUILD_ROOT/usr/man/man1 \ + INSTALLMAN3DIR=$RPM_BUILD_ROOT/usr/man/man3 \ + INSTALLARCHLIB=$RPM_BUILD_ROOT/killme \ + VARPREFIX=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT/killme find $RPM_BUILD_ROOT -not -type d -printf "/%%P\n" > manifest diff --git a/debian/changelog b/debian/changelog index ad0cfa8..0e333fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +alien (6.99999) unstable; urgency=low + + * I despise MakeMaker. + + -- Joey Hess Sun, 23 Apr 2000 21:44:05 -0700 + alien (6.9999) unstable; urgency=low * Major typo fix in Tgz.pm. diff --git a/debian/rules b/debian/rules index e9827f5..4acbef9 100755 --- a/debian/rules +++ b/debian/rules @@ -24,12 +24,12 @@ binary-indep: build dh_testdir dh_testroot dh_clean -k - $(MAKE) pure_install PREFIX=$(shell pwd)/debian/tmp/ INSTALLDIRS=perl \ + $(MAKE) pure_install INSTALLDIRS=perl \ + PREFIX=$(shell pwd)/debian/tmp/$(shell perl -MConfig -e 'print $$Config{prefix}') \ INSTALLMAN1DIR=$(shell pwd)/debian/tmp/usr/share/man/man1 \ INSTALLMAN3DIR=$(shell pwd)/debian/tmp/usr/share/man/man3 \ - INSTALLPRIVLIB=$(shell pwd)/debian/tmp/usr/lib/perl5 \ - INSTALLSCRIPT=$(shell pwd)/debian/tmp/usr/bin \ - INSTALLARCHLIB=$(shell pwd)/debian/tmp/killme + INSTALLARCHLIB=$(shell pwd)/debian/tmp/killme \ + VARPREFIX=$(shell pwd)/debian/tmp # Who does it make this empty directory? Sigh. rm -rf debian/tmp/killme dh_installdocs README gendiff.txt