diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
| commit | 38d2959ffb8c6f5f291b2910014a67b1b352ab4c (patch) | |
| tree | c5977b8f34aaf973ed3956952ec3ff43ac59f143 /doc/en | |
| parent | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (diff) | |
| parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
Diffstat (limited to 'doc/en')
| -rw-r--r-- | doc/en/makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/en/makefile b/doc/en/makefile index 247ce38b5..1be137c73 100644 --- a/doc/en/makefile +++ b/doc/en/makefile @@ -19,23 +19,19 @@ apt-vendor.ent: ../../vendor/current/apt-vendor.ent ln -sf $(shell readlink -f $^) $@ # Install generation hooks -manpages: $($(LOCAL)-LIST) apt.8 +manpages: $($(LOCAL)-LIST) $($(LOCAL)-LIST) :: % : ../%.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< -apt.8: ../apt.8 - cp -a ../apt.8 apt.8 - # Clean rule .PHONY: clean/$(LOCAL) veryclean: clean/$(LOCAL) clean: clean/$(LOCAL) clean/$(LOCAL): - -rm -rf $($(@F)-LIST) apt.8 apt-vendor.ent + -rm -rf $($(@F)-LIST) apt-vendor.ent endif # Chain to the manpage rule -SOURCE = apt.8 include $(MANPAGE_H) |