Win32 updates

[~andy/aweather-pkg] / win / Makefile

diff --git a/win/Makefile b/win/Makefile
index 96982ac6706047b2993cc41ef8620ccbfe228839..947b1b50fdde8e0a7a77b7a5c615a3d84e918548 100644 (file)
--- a/win/Makefile
+++ b/win/Makefile
@@ -11,7 +11,7 @@ all: $(INSTALLERS)
 
 clean:
        @echo clean-win
-       rm -f $(INSTALLERS)
+       rm -rf $(INSTALLERS) $(DESTDIR)
 
 $(DESTDIR):
        make -C $(WIN_AWEATHER) install
@@ -19,23 +19,23 @@ $(DESTDIR):
        make -C $(WIN_RSL)      install
        find $(DESTDIR) -name '*.a'  -delete
        find $(DESTDIR) -name '*.la' -delete
-       rm -rf $(DESTDIR)/share/rsl/colors
+       rm -rf $(DESTDIR)/share/rsl1/colors
        rm -rf $(DESTDIR)/include
        touch $@
 
 $(INSTALLERS): $(DESTDIR)
-       cd $(WIN_AWEATHER); \
-       makensis -DVERSION=$(VER_AWEATHER) aweather.nsi; \
-       makensis -DVERSION=$(VER_AWEATHER) -DUSE_GTK aweather.nsi
+       makensis -DROOT=$(WIN_AWEATHER) -DVERSION=$(VER_AWEATHER) aweather.nsi; \
+       makensis -DROOT=$(WIN_AWEATHER) -DVERSION=$(VER_AWEATHER) -DUSE_GTK aweather.nsi
        cp $(WIN_AWEATHER)/aweather-$(VERSION)*.exe $(FILES)
 
 aweather-gen:
        cd $(WIN_AWEATHER); \
-       PKG_CONFIG_PATH="$(WIN_GRITS)" \
-       LIBS="-L$(WIN_GRITS)" \
-       CPPFLAGS="-I$(WIN_GRITS)" \
+       PKG_CONFIG_PATH="$(WIN_GRITS)/src" \
+       CPPFLAGS="-I$(WIN_GRITS)/include/grits" \
+       LIBS="-L$(WIN_GRITS)/src/.libs" \
        CFLAGS="-g -Werror -Wno-unused -O3" \
        ./autogen.sh \
+               --enable-relative \
                --enable-shared \
                --disable-static \
                --host=i686-pc-mingw32
@@ -43,6 +43,7 @@ aweather-gen:
 grits-gen:
        cd $(WIN_GRITS); \
        ./autogen.sh \
+               --enable-relative \
                --enable-shared \
                --disable-static \
                --host=i686-pc-mingw32 \