diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rwxr-xr-x | pbuilder-checkparams | 9 |
3 files changed, 16 insertions, 1 deletions
@@ -9,6 +9,7 @@ install: install -d $(DESTDIR)/usr/sbin install -d $(DESTDIR)/usr/bin install -d $(DESTDIR)/usr/lib/pbuilder + install -d $(DESTDIR)/usr/share/pbuilder install -m 755 pbuilder-buildpackage $(DESTDIR)/usr/lib/pbuilder/ install -m 755 pbuilder-createbuildenv $(DESTDIR)/usr/lib/pbuilder/ install -m 755 pbuilder-updatebuildenv $(DESTDIR)/usr/lib/pbuilder/ @@ -18,4 +19,5 @@ install: install -m 755 pbuilder $(DESTDIR)/usr/sbin install -m 755 pdebuild $(DESTDIR)/usr/bin install -m 644 pbuilderrc $(DESTDIR)/etc + install -m 644 pbuilderrc $(DESTDIR)/usr/share/pbuilder diff --git a/debian/changelog b/debian/changelog index ba5dcfc..121b39f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pbuilder (0.18) unstable; urgency=low + + * Added usr/share/pbuilder/pbuilderrc for default. + + -- Junichi Uekawa <dancer@debian.org> Tue, 15 Jan 2002 11:20:25 +0900 + pbuilder (0.17) unstable; urgency=low * new version, "Documentation updates and cosmetic fixes". diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 45dcd4e..6ee569c 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -4,7 +4,14 @@ # empty some vars. DPKG_BUILDPACKAGEOPT="" -. /etc/pbuilderrc +for RCFILE in /usr/share/pbuilder/pbuilderrc /etc/pbuilderrc; do + if [ -f "$RCFILE"]; then + . "$RCFILE" + else + echo "Warning: $RCFILE does not exist" + fi +done + . /usr/lib/pbuilder/pbuilder-modules # the default is to add a PID in the buildplace specified in the config file. |