diff options
author | Peter Palfrader <peter@palfrader.org> | 2006-05-05 14:23:27 +0000 |
---|---|---|
committer | Peter Palfrader <peter@palfrader.org> | 2006-05-05 14:23:27 +0000 |
commit | fb1002cc5430d4aabee3a54d5e726cde53d2d3f4 (patch) | |
tree | cf66fe190708b62961f68a98a08c408a409f78e6 | |
parent | 35b0de138dea24760e4692981d1cdca4bf109074 (diff) | |
download | tor-fb1002cc5430d4aabee3a54d5e726cde53d2d3f4.tar.gz tor-fb1002cc5430d4aabee3a54d5e726cde53d2d3f4.zip |
Remove support for my nodoc DEB_BUILD_OPTIONS variable. It clutters stuff and I haven't used it in ages
svn:r6439
-rw-r--r-- | changelog | 7 | ||||
-rwxr-xr-x | rules | 23 |
2 files changed, 8 insertions, 22 deletions
@@ -1,3 +1,10 @@ +tor (0.1.1.XXXXXXX) XXperimental; urgency=low + + * Remove support for my nodoc DEB_BUILD_OPTIONS variable. It clutters + stuff and I haven't used it in ages. + + -- Peter Palfrader <weasel@debian.org> Wed, 12 Apr 2006 00:27:54 +0200 + tor (0.1.1.18-rc-1) experimental; urgency=low * New upstream version. @@ -35,11 +35,6 @@ endif # INSTALL_PROGRAM += -s #endif -# Prevent the design paper from being built with "nodoc" -ifneq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS))) - BUILD_DOC = no -endif - # Prevent the unit tests from being run with "nocheck" ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) RUN_TEST = no @@ -111,19 +106,7 @@ build-stamp: config.status fi # XXX ends - if [ "$(BUILD_DOC)" != "no" ]; then \ - make -C doc/design-paper tor-design.ps tor-design.pdf || \ - ( echo -e "*\n*\n*\n*"; \ - echo "* Building some docs failed, perhaps because you did not install the"; \ - echo "* declared build dependencies and then used -o with dpkg-buildpackage."; \ - echo "*"; \ - echo "* If you want to skip this part, you can set nodoc in DEB_BUILD_OPTIONS" ; \ - echo "* and start the build again. DEB_BUILD_OPTIONS=nodoc dpkg-buildpackage.."; \ - echo -e "*\n*\n*\n*"; \ - false ); \ - else \ - echo -e "\n\nSkipping tor-design.{ps,pdf}\n\n"; \ - fi + make -C doc/design-paper tor-design.ps tor-design.pdf touch build-stamp @@ -173,10 +156,6 @@ binary-arch: build install dh_testroot dh_installchangelogs ChangeLog dh_installdocs - if [ "$(BUILD_DOC)" != "no" ]; then \ - install -m 644 doc/design-paper/tor-design.ps $(CURDIR)/debian/tor/usr/share/doc/tor/; \ - install -m 644 doc/design-paper/tor-design.pdf $(CURDIR)/debian/tor/usr/share/doc/tor/; \ - fi dh_installexamples # dh_install # dh_installdebconf |