diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | pica-client/main.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index d622fbb..d3e7708 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,9 +37,9 @@ EXTRA_DIST += nodelist_db_create.sql endif ##################################### if PICA_CLIENT -bin_PROGRAMS += pica-client +bin_PROGRAMS += pica-client/pica-client -pica_client_SOURCES = \ +pica_client_pica_client_SOURCES = \ pica-client/accounts.cpp \ pica-client/accounts.h \ pica-client/accountswindow.cpp \ @@ -87,7 +87,7 @@ PICA_msgproc.c \ PICA_msgproc.h \ PICA_common.h PICA_proto.h -nodist_pica_client_SOURCES = \ +nodist_pica_client_pica_client_SOURCES = \ moc_accountswindow.cpp \ moc_addaccountdialog.cpp \ moc_askpassword.cpp \ @@ -119,8 +119,8 @@ ui_%.h: pica-client/%.ui uic $(CPPFLAGS) $< -o $@ -pica_client_CPPFLAGS = -DPICA_INSTALLPREFIX=\"$(prefix)\" $(QT_DEPENDENCIES_CFLAGS) -pica_client_LDADD = $(QT_DEPENDENCIES_LIBS) +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 diff --git a/pica-client/main.cpp b/pica-client/main.cpp index f7a725b..f6709cf 100644 --- a/pica-client/main.cpp +++ b/pica-client/main.cpp @@ -29,7 +29,7 @@ class PicaSysTray *systray; // /usr/share/pica-client/pica-pica_CA.pem //QString config_defaultCA("/home/root_jr/files/projects/picapica_wc/localhost/project_picapica/trunk/tests/trusted_CA.pem"); -QString config_defaultCA(PICA_INSTALLPREFIX"share/pica-client/trusted_CA.pem"); +QString config_defaultCA(PICA_INSTALLPREFIX"/share/pica-client/trusted_CA.pem"); static bool create_config_dir() { @@ -132,8 +132,8 @@ int main(int argc, char *argv[]) if (!create_config_dir()) return -1; - picapica_ico_sit = QIcon(PICA_INSTALLPREFIX"share/pica-client/picapica-icon-sit.png"); - picapica_ico_fly = QIcon(PICA_INSTALLPREFIX"share/pica-client/picapica-icon-fly.png"); + picapica_ico_sit = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-sit.png"); + picapica_ico_fly = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-fly.png"); PicaActionCenter ac; action_center = ∾ |