Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix "make install" with documentation disabled
  build: simplify some conditional targets

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc Makefile
index cb3e60e,0df8a11..a8e44b9
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -43,20 -41,10 +43,14 @@@ FF_LDFLAGS   := $(FFLDFLAGS
  FF_EXTRALIBS := $(FFEXTRALIBS)
  FF_DEP_LIBS  := $(DEP_LIBS)
  
- ALL_TARGETS-$(CONFIG_DOC)       += documentation
+ all-$(CONFIG_DOC): documentation
  
- ifdef PROGS
- INSTALL_TARGETS-yes             += install-progs install-data
- INSTALL_TARGETS-$(CONFIG_DOC)   += install-man
- endif
- INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
- 
- all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
+ all: $(FF_DEP_LIBS) $(PROGS)
  
 +$(PROGS): %$(EXESUF): %_g$(EXESUF)
 +      $(CP) $< $@
 +      $(STRIP) $@
 +
  config.h: .config
  .config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
        @-tput bold 2>/dev/null