diff -Naur gkrellweather-2.0.6/gkrellweather.c gkrellweather-2.0.6.new/gkrellweather.c --- gkrellweather-2.0.6/gkrellweather.c 2003-03-31 14:12:57 +0300 +++ gkrellweather-2.0.6.new/gkrellweather.c 2004-05-18 20:36:36 +0300 @@ -720,7 +720,7 @@ options.station[1] = c[1]; options.station[2] = c[2]; options.station[3] = c[3]; - sprintf(options.command, PREFIX "/bin/GrabWeather %s", options.station); + sprintf(options.command, "/usr/lib/gkrellm2/GrabWeather %s", options.station); sprintf(options.filename, "%s/.wmWeatherReports/%s.dat", getenv("HOME"), options.station); net_update = FALSE; diff -Naur gkrellweather-2.0.6/Makefile gkrellweather-2.0.6.new/Makefile --- gkrellweather-2.0.6/Makefile 2003-03-31 14:12:57 +0300 +++ gkrellweather-2.0.6.new/Makefile 2004-05-18 20:38:12 +0300 @@ -1,3 +1,5 @@ +PLUGIN_DIR ?=/usr/local/lib/gkrellm2/plugins + PKGNAME = gkrellweather VERSION = 2.0.6 CFLAGS = -O2 -Wall -fPIC `pkg-config gtk+-2.0 --cflags` @@ -31,14 +33,8 @@ install: (cd po && ${MAKE} install ) - if [ -d /usr/lib/gkrellm2/plugins/ ] ; then \ - install -c -s -m 644 gkrellweather.so /usr/lib/gkrellm2/plugins/ ; \ - elif [ -d $(PREFIX)/lib/gkrellm2/plugins/ ] ; then \ - install -c -s -m 644 gkrellweather.so $(PREFIX)/lib/gkrellm2/plugins/ ; \ - else \ - install -D -c -s -m 644 gkrellweather.so $(PREFIX)/lib/gkrellm2/plugins/gkrellweather.so ; \ - fi - install -c -m 755 GrabWeather $(PREFIX)/bin + $(INSTALL) -d $(PLUGIN_DIR) + $(INSTALL) gkrellweather.so $(PLUGIN_DIR) uninstall: (cd po && ${MAKE} uninstall )