diff options
| author | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2012-08-18 22:19:22 +0000 |
|---|---|---|
| committer | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2012-08-18 22:19:22 +0000 |
| commit | bd6be0811c5643c1f3c505493b52a9d8c26c6f51 (patch) | |
| tree | 385dac1e9710153ff19710f84c5779d498878ee4 /Makefile.am | |
| parent | 88042ee35fedaca70f8724380bd06a182074b89c (diff) | |
| download | pica-pica-bd6be0811c5643c1f3c505493b52a9d8c26c6f51.tar.gz pica-pica-bd6be0811c5643c1f3c505493b52a9d8c26c6f51.zip | |
bugfix - AC_PROG_CXX must be always unconditional; separate data dirs for pica-node and pica-client
git-svn-id: svn://localhost/project_picapica/trunk@168 fb96df88-216d-11de-830c-f3023f12d8ac
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 7 insertions, 2 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 |