Updated the Makefile for proper 'make install'.

Created an entry in Makefile to install icons/executable.  Make install
will now put the completed installation in /usr/local/bin/ for the
executable and in /usr/local/share/bitmaps for the pix.

diff --git a/daphne/Makefile b/daphne/Makefile
index 93ec4561ca1a4b9a253ede29b26e1cfbae90645a..17ef23dedce30a4a3cc9608b0565794aefa69e96 100644 (file)
--- a/daphne/Makefile
+++ b/daphne/Makefile
@@ -22,5 +22,8 @@ daphne: main.o citclient.o userlogin.o testwindow.o who.o \
 install: 
        
        cp daphne /usr/local/bin/./
+       mkdir /usr/local/share/bitmaps  
+       cp bitmaps/*.xpm /usr/local/share/bitmaps/./
+       cp bitmaps/*.bmp /usr/local/share/bitmaps/./
 clean:
        rm -f *.o core daphne

diff --git a/daphne/main.cpp b/daphne/main.cpp
index 80b2beb1967619c543281e5da86b3e05e9557f2f..84797e5cb7739a386aa0ace63001389f96f50982 100644 (file)
--- a/daphne/main.cpp
+++ b/daphne/main.cpp
@@ -10,12 +10,12 @@
 #include "includes.hpp"
 
 #ifdef __WXMOTIF__
-#include "bitmaps/globe.xpm"
-#include "bitmaps/mail.xpm"
-#include "bitmaps/who.xpm"
-#include "bitmaps/chat.xpm"
-#include "bitmaps/xglobe.xpm"
-#include "bitmaps/goto.xpm"
+#include "/usr/local/share/bitmaps/globe.xpm"
+#include "/usr/local/share/bitmaps/mail.xpm"
+#include "/usr/local/share/bitmaps/who.xpm"
+#include "/usr/local/share/bitmaps/chat.xpm"
+#include "/usr/local/share/bitmaps/xglobe.xpm"
+#include "/usr/local/share/bitmaps/goto.xpm"
 #endif
 
 
@@ -259,12 +259,12 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) {
 
         // Set up the toolbar icons (BMP is available on both GTK and MSW) 
 #ifndef __WXMOTIF__
-       bitmaps[0] = new wxBitmap("bitmaps/globe.bmp",  wxBITMAP_TYPE_BMP);
-       bitmaps[1] = new wxBitmap("bitmaps/mail.bmp",   wxBITMAP_TYPE_BMP);
-       bitmaps[2] = new wxBitmap("bitmaps/who.bmp",    wxBITMAP_TYPE_BMP);
-       bitmaps[3] = new wxBitmap("bitmaps/chat.bmp",   wxBITMAP_TYPE_BMP);
-       bitmaps[4] = new wxBitmap("bitmaps/xglobe.bmp", wxBITMAP_TYPE_BMP);
-       bitmaps[5] = new wxBitmap("bitmaps/goto.bmp",   wxBITMAP_TYPE_BMP);
+       bitmaps[0] = new wxBitmap("/usr/local/share/bitmaps/globe.bmp", wxBITMAP_TYPE_BMP);
+       bitmaps[1] = new wxBitmap("/usr/local/share/bitmaps/mail.bmp", wxBITMAP_TYPE_BMP);
+       bitmaps[2] = new wxBitmap("/usr/local/share/bitmaps/who.bmp", wxBITMAP_TYPE_BMP);
+       bitmaps[3] = new wxBitmap("/usr/local/share/bitmaps/chat.bmp", wxBITMAP_TYPE_BMP);
+       bitmaps[4] = new wxBitmap("/usr/local/share/bitmaps/xglobe.bmp", wxBITMAP_TYPE_BMP);
+       bitmaps[5] = new wxBitmap("/usr/local/share/bitmaps/goto.bmp", wxBITMAP_TYPE_BMP);
 #else
        bitmaps[0] = new wxBitmap(globe_xpm);
        bitmaps[1] = new wxBitmap(mail_xpm);