package/qlibc/0002-obey-destdir.patch

   1 From dbdc772a35244b45c725a72fad5ddade9bd7d521 Mon Sep 17 00:00:00 2001
   2 From: pcarpent <pierre-francois.carpentier@c-s.fr>
   3 Date: Tue, 15 Dec 2015 10:23:44 +0100
   4 Subject: [PATCH] fix makefile
   5
   6 add DESTDIR variables in install targets
   7
   8 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
   9 (downloaded from upstream commit not included in v2.4.1
  10  https://github.com/wolkykim/qlibc/commit/dbdc772a35244b45c725a72fad5ddade9bd7d521)
  11 ---
  12  src/Makefile.in | 110 ++++++++++++++++++++++++++++----------------------------
  13  1 file changed, 55 insertions(+), 55 deletions(-)
  14
  15 diff --git a/src/Makefile.in b/src/Makefile.in
  16 index 8a7ab43..4e274ed 100644
  17 --- a/src/Makefile.in
  18 +++ b/src/Makefile.in
  19 @@ -122,70 +122,70 @@ qlibcext: ${QLIBCEXT_OBJS}
  20  install: ${INSTALL_TARGETS}
  21
  22  install-qlibc: qlibc
  23 -       ${MKDIR_P} ${INST_INCDIR}/qlibc
  24 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h ${INST_INCDIR}/qlibc/qlibc.h
  25 -       ${MKDIR_P} ${INST_INCDIR}/qlibc/containers/
  26 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qtreetbl.h ${INST_INCDIR}/qlibc/containers/qtreetbl.h
  27 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhashtbl.h ${INST_INCDIR}/qlibc/containers/qhashtbl.h
  28 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhasharr.h ${INST_INCDIR}/qlibc/containers/qhasharr.h
  29 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlisttbl.h ${INST_INCDIR}/qlibc/containers/qlisttbl.h
  30 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlist.h ${INST_INCDIR}/qlibc/containers/qlist.h
  31 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qvector.h ${INST_INCDIR}/qlibc/containers/qvector.h
  32 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qqueue.h ${INST_INCDIR}/qlibc/containers/qqueue.h
  33 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qstack.h ${INST_INCDIR}/qlibc/containers/qstack.h
  34 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qgrow.h ${INST_INCDIR}/qlibc/containers/qgrow.h
  35 -       ${MKDIR_P} ${INST_INCDIR}/qlibc/utilities/
  36 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qcount.h ${INST_INCDIR}/qlibc/utilities/qcount.h
  37 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qencode.h ${INST_INCDIR}/qlibc/utilities/qencode.h
  38 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qfile.h ${INST_INCDIR}/qlibc/utilities/qfile.h
  39 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qhash.h ${INST_INCDIR}/qlibc/utilities/qhash.h
  40 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qio.h ${INST_INCDIR}/qlibc/utilities/qio.h
  41 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsocket.h ${INST_INCDIR}/qlibc/utilities/qsocket.h
  42 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qstring.h ${INST_INCDIR}/qlibc/utilities/qstring.h
  43 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsystem.h ${INST_INCDIR}/qlibc/utilities/qsystem.h
  44 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qtime.h ${INST_INCDIR}/qlibc/utilities/qtime.h
  45 -       ${MKDIR_P} ${INST_INCDIR}/qlibc/ipc/
  46 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qsem.h ${INST_INCDIR}/qlibc/ipc/qsem.h
  47 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qshm.h ${INST_INCDIR}/qlibc/ipc/qshm.h
  48 -       ${MKDIR_P} ${INST_LIBDIR}
  49 -       ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} ${INST_LIBDIR}/${QLIBC_LIBNAME}
  50 -       ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} ${INST_LIBDIR}/${QLIBC_SLIBREALNAME}
  51 -       ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} )
  52 +       ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc
  53 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h $(DESTDIR)/${INST_INCDIR}/qlibc/qlibc.h
  54 +       ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/containers/
  55 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qtreetbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qtreetbl.h
  56 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhashtbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qhashtbl.h
  57 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhasharr.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qhasharr.h
  58 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlisttbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qlisttbl.h
  59 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlist.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qlist.h
  60 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qvector.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qvector.h
  61 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qqueue.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qqueue.h
  62 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qstack.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qstack.h
  63 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qgrow.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qgrow.h
  64 +       ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/
  65 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qcount.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qcount.h
  66 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qencode.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qencode.h
  67 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qfile.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qfile.h
  68 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qhash.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qhash.h
  69 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qio.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qio.h
  70 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsocket.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qsocket.h
  71 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qstring.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qstring.h
  72 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsystem.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qsystem.h
  73 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qtime.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qtime.h
  74 +       ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/
  75 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qsem.h $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/qsem.h
  76 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qshm.h $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/qshm.h
  77 +       ${MKDIR_P} $(DESTDIR)/${INST_LIBDIR}
  78 +       ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBC_LIBNAME}
  79 +       ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBREALNAME}
  80 +       ( cd $(DESTDIR)/${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} )
  81
  82  uninstall-qlibc:
  83 -       ${RM} -f ${INST_INCDIR}/qlibc/qlibc.h
  84 -       ${RM} -rf ${INST_INCDIR}/qlibc/containers
  85 -       ${RM} -rf ${INST_INCDIR}/qlibc/utilities
  86 -       ${RM} -rf ${INST_INCDIR}/qlibc/ipc
  87 -       ${RM} -f ${INST_LIBDIR}/${QLIBC_LIBNAME}
  88 -       ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBREALNAME}
  89 -       ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBNAME}
  90 +       ${RM} -f $(DESTDIR)/${INST_INCDIR}/qlibc/qlibc.h
  91 +       ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/containers
  92 +       ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/utilities
  93 +       ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/ipc
  94 +       ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_LIBNAME}
  95 +       ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBREALNAME}
  96 +       ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBNAME}
  97
  98  install-qlibcext: qlibcext
  99 -       ${MKDIR_P} ${INST_INCDIR}/qlibc
 100 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h ${INST_INCDIR}/qlibc/qlibcext.h
 101 -       ${MKDIR_P} ${INST_INCDIR}/qlibc/extensions/
 102 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qconfig.h ${INST_INCDIR}/qlibc/extensions/qconfig.h
 103 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qaconf.h ${INST_INCDIR}/qlibc/extensions/qaconf.h
 104 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qlog.h ${INST_INCDIR}/qlibc/extensions/qlog.h
 105 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qhttpclient.h ${INST_INCDIR}/qlibc/extensions/qhttpclient.h
 106 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qdatabase.h ${INST_INCDIR}/qlibc/extensions/qdatabase.h
 107 -       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qtokenbucket.h ${INST_INCDIR}/qlibc/extensions/qtokenbucket.h
 108 -       ${MKDIR_P} ${INST_LIBDIR}
 109 -       ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} ${INST_LIBDIR}/${QLIBCEXT_LIBNAME}
 110 -       ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME}
 111 -       ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} )
 112 +       ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc
 113 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h $(DESTDIR)/${INST_INCDIR}/qlibc/qlibcext.h
 114 +       ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/
 115 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qconfig.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qconfig.h
 116 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qaconf.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qaconf.h
 117 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qlog.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qlog.h
 118 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qhttpclient.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qhttpclient.h
 119 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qdatabase.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qdatabase.h
 120 +       ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qtokenbucket.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qtokenbucket.h
 121 +       ${MKDIR_P} $(DESTDIR)/${INST_LIBDIR}
 122 +       ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_LIBNAME}
 123 +       ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME}
 124 +       ( cd $(DESTDIR)/${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} )
 125
 126  uninstall-qlibcext:
 127 -       ${RM} -f ${INST_INCDIR}/qlibc/qlibcext.h
 128 -       ${RM} -rf ${INST_INCDIR}/qlibc/extensions
 129 -       ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_LIBNAME}
 130 -       ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME}
 131 -       ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBNAME}
 132 +       ${RM} -f $(DESTDIR)/${INST_INCDIR}/qlibc/qlibcext.h
 133 +       ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/extensions
 134 +       ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_LIBNAME}
 135 +       ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME}
 136 +       ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBNAME}
 137
 138  deinstall: uninstall
 139  uninstall: uninstall-qlibc uninstall-qlibcext
 140 -       ${RMDIR} ${INST_INCDIR}/qlibc
 141 +       ${RMDIR} $(DESTDIR)/${INST_INCDIR}/qlibc
 142
 143  clean:
 144         ${RM} -f ${QLIBC_OBJS}