FreeBSD port fixes.

diff --git a/Makefile b/Makefile
index 3d007569be2834ac3e5031026bee2e4a1a319bf3..c51073bc52731e0a717b8e282b9a8821fcbde62d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,16 @@ cppcheck:
 
 # Note: does not install desktop file.
 install: bs.6 uninstall
-       cp bs $(DESTDIR)/usr/bin
-       cp bs.6 $(DESTDIR)/usr/share/man/man6/bs.6
+       install -m 0755 -d $(DESTDIR)/usr/bin
+       install -m 0755 -d $(DESTDIR)/usr/share/man/man6
+       install -m 0755 -d $(DESTDIR)//usr/share/applications/
+       install -m 0755 -d $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/
+       install -m 0755 -d $(DESTDIR)/usr/share/appdata
+       install -m 0755 bs $(DESTDIR)/usr/bin/
+       install -m 0644 bs.6 $(DESTDIR)/usr/share/man/man6/
+       install -m 0644 bs.desktop $(DESTDIR)/usr/share/applications/
+       install -m 0644 battleship.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/
+       install -m 0644 bs.xml $(DESTDIR)/usr/share/appdata/
 
 uninstall:
        rm -f /usr/bin/bs /usr/share/man/man6/bs.6

diff --git a/bs.c b/bs.c
index cf1788eaf7d1ce7cdfce93cb8d6982db77d32cb2..bd56910feaa90ee07dea4b6b3cce0d1cae5702bf 100644 (file)
--- a/bs.c
+++ b/bs.c
@@ -1279,6 +1279,7 @@ int main(int argc, char *argv[])
        (playagain());
     uninitgame(0);
     /*NOTREACHED*/
+    return 0;
 }
 
 /* bs.c ends here */