diff options
author | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
commit | 8a1c9010137a8c49d9808f2db34b9ee277138986 (patch) | |
tree | 5ec5c0103cb896407d8c9542fac0ec8ab3313602 /doc/en/makefile | |
parent | fa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (diff) | |
parent | 417e83d0d79637266e04c98189c62ce85bcdf737 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
debian/apt.auto-removal.sh
debian/changelog
vendor/debian/sources.list.in
Diffstat (limited to 'doc/en/makefile')
-rw-r--r-- | doc/en/makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/en/makefile b/doc/en/makefile index 247ce38b5..d1415fea1 100644 --- a/doc/en/makefile +++ b/doc/en/makefile @@ -19,23 +19,23 @@ apt-vendor.ent: ../../vendor/current/apt-vendor.ent ln -sf $(shell readlink -f $^) $@ # Install generation hooks -manpages: $($(LOCAL)-LIST) apt.8 +manpages: $($(LOCAL)-LIST) apt.7 $($(LOCAL)-LIST) :: % : ../%.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< -apt.8: ../apt.8 - cp -a ../apt.8 apt.8 +apt.7: ../apt.7 + cp -a ../apt.7 apt.7 # 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.7 apt-vendor.ent endif # Chain to the manpage rule -SOURCE = apt.8 +SOURCE = apt.7 include $(MANPAGE_H) |