diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index d3e7708..841663f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = CLEANFILES = -dist_pkgdata_DATA = CA.pem +#dist_pkgdata_DATA = CA.pem EXTRA_DIST = iniparser/LICENSE \ @@ -34,6 +34,10 @@ nodelist.db: nodelist_db_create.sql EXTRA_DIST += nodelist_db_create.sql +pkgpicanodedir = ${datarootdir}/pica-node + +dist_pkgpicanode_DATA = CA.pem README nodelist_db_create.sql + endif ##################################### if PICA_CLIENT @@ -122,7 +126,8 @@ ui_%.h: pica-client/%.ui pica_client_pica_client_CPPFLAGS = -DPICA_INSTALLPREFIX=\"$(prefix)\" $(QT_DEPENDENCIES_CFLAGS) pica_client_pica_client_LDADD = $(QT_DEPENDENCIES_LIBS) -dist_pkgdata_DATA += pica-client/picapica-icon-fly.png pica-client/picapica-icon-sit.png +pkgpicaclientdir = ${datarootdir}/pica-client +dist_pkgpicaclient_DATA = CA.pem pica-client/picapica-icon-fly.png pica-client/picapica-icon-sit.png #$(filter moc_%.cpp,$(pica_client_SOURCES)) CLEANFILES += moc_*.cpp ui_*.h diff --git a/configure.ac b/configure.ac index 563f891..3b105ce 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ AC_CONFIG_SRCDIR([PICA_node.c]) # Checks for programs. AC_PROG_CC +AC_PROG_CXX AC_PROG_INSTALL # Checks for common libraries, required by both pica-node and pica-client @@ -51,8 +52,8 @@ if test "x$SQLITE3" != xyes; then ]) #pica-client tests -AS_IF([test "x$PICA_NODE_ENABLED" = "xyes"],[ -AC_PROG_CXX +AS_IF([test "x$PICA_CLIENT_ENABLED" = "xyes"],[ +#AC_PROG_CXX PKG_CHECK_MODULES([QT_DEPENDENCIES], [QtCore QtGui QtSql QtNetwork]) AC_SUBST([QT_DEPENDENCIES_CFLAGS]) AC_SUBST([QT_DEPENDENCIES_LIBS]) |