src/Makefile: Rename DATADIR to AHOVIEWER_DATADIR

ahodesuka · Oct 15, 2018 · dfc9745 · dfc9745
1 parent 594a7b6
commit dfc9745
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -55,7 +55,7 @@ PHONY: version
 version:
 	@cd .. && ./version.sh > /dev/null 2>&1
 
-ahoviewer_CPPFLAGS = @CPPFLAGS@ @LIBCURL_CPPFLAGS@ -DDATADIR=\"$(datadir)\"
+ahoviewer_CPPFLAGS = @CPPFLAGS@ @LIBCURL_CPPFLAGS@ -DAHOVIEWER_DATADIR=\"$(datadir)\"
 ahoviewer_CXXFLAGS = @CXXFLAGS@ @gtkmm_CFLAGS@ @libconfig_CFLAGS@ @libxml2_CFLAGS@ \
 				@gstreamer_CFLAGS@ @libsecret_CFLAGS@ @libzip_CFLAGS@ \
 				@OpenSSL_CFLAGS@ @GnuTLS_CFLAGS@

diff --git a/src/mainwindow.cc b/src/mainwindow.cc
@@ -32,7 +32,7 @@ MainWindow::MainWindow(BaseObjectType *cobj, const Glib::RefPtr<Gtk::Builder> &b
     try
     {
         Glib::RefPtr<Gdk::Pixbuf> icon =
-            Gdk::Pixbuf::create_from_file(DATADIR "/icons/hicolor/64x64/apps/ahoviewer.png");
+            Gdk::Pixbuf::create_from_file(AHOVIEWER_DATADIR "/icons/hicolor/64x64/apps/ahoviewer.png");
         set_icon(icon);
     }
     catch (...) { }
@@ -123,7 +123,7 @@ MainWindow::MainWindow(BaseObjectType *cobj, const Glib::RefPtr<Gtk::Builder> &b
             Glib::RefPtr<Gdk::Pixbuf> logo = Gdk::Pixbuf::create_from_file(path);
 #else
             Glib::RefPtr<Gdk::Pixbuf> logo =
-                Gdk::Pixbuf::create_from_file(DATADIR "/pixmaps/ahoviewer/ahoviewer-about-logo.png");
+                Gdk::Pixbuf::create_from_file(AHOVIEWER_DATADIR "/pixmaps/ahoviewer/ahoviewer-about-logo.png");
 #endif // _WIN32
             m_AboutDialog->set_logo(logo);
         }