Pileus Git - ~andy/sunrise/blob - dev-util/mockpp/files/1.11.5-destdir.patch

   1 diff -Naur mockpp-1.11.5/Makefile.am mockpp-1.11.5.new/Makefile.am
   2 --- mockpp-1.11.5/Makefile.am   2006-04-26 22:01:19.000000000 +0200
   3 +++ mockpp-1.11.5.new/Makefile.am       2006-06-24 21:51:29.000000000 +0200
   4 @@ -11,12 +11,6 @@
   5    mockpp.doxygen.in \
   6    mockpp.kdevses \
   7    mockpp.kdevelop \
   8 -  AUTHORS \
   9 -  COPYING \
  10 -  ChangeLog \
  11 -  INSTALL \
  12 -  README \
  13 -  TODO \
  14    Makefile.cvs \
  15    mockpp.lsm \
  16    gen_files_N.sh \
  17 @@ -95,7 +89,5 @@
  18  htmldir = $(pkgdatadir)/html
  19
  20  install-data-hook:
  21 -       $(mkdir_p) $(htmldir)
  22 -       $(INSTALL) $(srcdir)/AUTHORS $(srcdir)/COPYING $(srcdir)/README $(srcdir)/ChangeLog   $(pkgdatadir)
  23
  24  #################################################################
  25 diff -Naur mockpp-1.11.5/mockpp/docs/api/Makefile.am mockpp-1.11.5.new/mockpp/docs/api/Makefile.am
  26 --- mockpp-1.11.5/mockpp/docs/api/Makefile.am   2005-11-19 21:21:24.000000000 +0100
  27 +++ mockpp-1.11.5.new/mockpp/docs/api/Makefile.am       2006-06-24 22:35:12.000000000 +0200
  28 @@ -52,9 +52,9 @@
  29  if DOXYGEN_DOC
  30
  31  install-data-hook: doc
  32 -       $(mkdir_p)                       $(DESTDIR)$(htmldir)/api-doc
  33 -       -find html | xargs -n 1 cp -v -t $(DESTDIR)$(htmldir)/api-doc
  34 -#      $(INSTALL) html/*                $(DESTDIR)$(htmldir)/api-doc
  35 +       $(mkdir_p)                       $(DESTDIR)/$(DOCDIR)/api-doc
  36 +       -find html | xargs -n 1 cp -v -t $(DESTDIR)/$(DOCDIR)/api-doc
  37 +#      $(INSTALL) html/*                $(DESTDIR)/$(DOCDIR)/api-doc
  38
  39  else
  40
  41 diff -Naur mockpp-1.11.5/mockpp/docs/en/Makefile.am mockpp-1.11.5.new/mockpp/docs/en/Makefile.am
  42 --- mockpp-1.11.5/mockpp/docs/en/Makefile.am    2006-04-08 18:49:52.000000000 +0200
  43 +++ mockpp-1.11.5.new/mockpp/docs/en/Makefile.am        2006-06-24 22:36:10.000000000 +0200
  44 @@ -80,12 +80,12 @@
  45  if DOCBOOK_DOC
  46
  47  install-data-hook: doc
  48 -       $(mkdir_p)                                 $(DESTDIR)$(htmldir)/handbook/common
  49 -       $(mkdir_p)                                 $(DESTDIR)$(htmldir)/handbook/images/callouts
  50 -       $(INSTALL) var/*.html                      $(DESTDIR)$(htmldir)/handbook
  51 -       $(INSTALL) $(srcdir)/common/*.css          $(DESTDIR)$(htmldir)/handbook/common
  52 -       $(INSTALL) $(srcdir)/images/*.png          $(DESTDIR)$(htmldir)/handbook/images
  53 -       $(INSTALL) $(srcdir)/images/callouts/*.png $(DESTDIR)$(htmldir)/handbook/images/callouts
  54 +       $(mkdir_p)                                 $(DESTDIR)/$(DOCDIR)/handbook/common
  55 +       $(mkdir_p)                                 $(DESTDIR)/$(DOCDIR)/handbook/images/callouts
  56 +       $(INSTALL) var/*.html                      $(DESTDIR)/$(DOCDIR)/handbook
  57 +       $(INSTALL) $(srcdir)/common/*.css          $(DESTDIR)/$(DOCDIR)/handbook/common
  58 +       $(INSTALL) $(srcdir)/images/*.png          $(DESTDIR)/$(DOCDIR)/handbook/images
  59 +       $(INSTALL) $(srcdir)/images/callouts/*.png $(DESTDIR)/$(DOCDIR)/handbook/images/callouts
  60
  61  else
  62
  63 diff -Naur mockpp-1.11.5/mockpp/examples/tutorial/Makefile.am mockpp-1.11.5.new/mockpp/examples/tutorial/Makefile.am
  64 --- mockpp-1.11.5/mockpp/examples/tutorial/Makefile.am  2005-11-19 20:17:51.000000000 +0100
  65 +++ mockpp-1.11.5.new/mockpp/examples/tutorial/Makefile.am      2006-06-24 22:41:04.000000000 +0200
  66 @@ -88,8 +88,8 @@
  67  if DOXYGEN_DOC
  68
  69  install-data-hook: tutorial
  70 -       $(mkdir_p) $(htmldir)/tutorial
  71 -       $(INSTALL) html/* $(htmldir)/tutorial
  72 +       $(mkdir_p) $(DESTDIR)/$(DOCDIR)/tutorial
  73 +       $(INSTALL) html/* $(DESTDIR)/$(DOCDIR)/tutorial
  74
  75  else
  76