Better fix for --with-icondir/--with-desktopdir not working w/ KDE (#6499)

We set up all the vars in configure, then override them if
--with-XXXdir is specified.

This is wrong: we should use --icondir not --with-icondir (the arg
isn't optional), but I don't want to break build scripts.

configure.ac

@@ -130,51 +130,6 @@ AC_SUBST([FULLLOCALEDIR])
 AC_SUBST([HAS_RELATIVE_LOCALEDIR])
 
 
-# icondir and desktopdir may differ from datadir (suggested by Gentoo)
-AC_ARG_WITH([icondir],
-            AS_HELP_STRING([--with-icondir@<:@=DIR@:>@], [change icon directory under gnome or kde, needs --with-gnome or --with-kde option]),
-		  [case "${withval}" in
-		   yes)
-				ICONDIR="${datadir}/icons"
-				;;
-		   no)
-				;;
-		   *)
-				ICONDIR="${withval}"
-				;;
-		   esac])
-AC_SUBST([ICONDIR])
-
-if test "x$icondir" = "xnone"; then
-        icondirset=no
-else
-        icondirset=yes
-fi
-
-AM_CONDITIONAL([HAS_ICONDIR], [test "x$icondirset" = "xyes"])
-
-AC_ARG_WITH([desktopdir],
-            AS_HELP_STRING([--with-desktopdir@<:@=DIR@:>@], [change desktop directory under gnome or kde, needs --with-gnome or --with-kde option]),
-		  [case "${withval}" in
-		   yes)	
-				DESKTOPDIR="${datadir}/applications"
-				;;
-		   no)
-				;;
-		   *)
-				DESKTOPDIR="${withval}"
-				;;
-		   esac])
-AC_SUBST([DESKTOPDIR])
-
-if test "x$desktopdir" = "xnone"; then
-        desktopdirset=no
-else
-        desktopdirset=yes
-fi
-
-AM_CONDITIONAL([HAS_DESKTOPDIR], [test "x$desktopdirset" = "xyes"])
-
 AC_ARG_ENABLE([game],
               AS_HELP_STRING([--disable-game], [disable compilation of game]),
 	      [game=$enableval],
@@ -530,8 +485,8 @@ else
 	gnome1found=yes
 fi
 
-AC_SUBST([GNOME1_DESKTOP])
-
+GNOME2_DESKTOP=${datadir}/applications
+GNOME_ICON=${datadir}/icons
 
 # KDE_CONFIG
 
@@ -545,6 +500,23 @@ else
 	kdefound=yes
 fi
 
+# icondir and desktopdir may differ from datadir (suggested by Gentoo), and
+# override above.
+AC_ARG_WITH([icondir],
+            AS_HELP_STRING([--with-icondir@<:@=DIR@:>@], [change icon directory under gnome or kde, needs --with-gnome or --with-kde option]),
+		  [GNOME_ICON="${with_icondir}"
+		   KDE_ICON="${with_icondir}"])
+
+AC_ARG_WITH([desktopdir],
+            AS_HELP_STRING([--with-desktopdir@<:@=DIR@:>@], [change desktop directory under gnome or kde, needs --with-gnome or --with-kde option]),
+		  [GNOME1_DESKTOP="${with_desktopdir}"
+		   GNOME2_DESKTOP="${with_desktopdir}"
+		   KDE_DESKTOP="${with_desktopdir}"])
+
+AC_SUBST([GNOME1_DESKTOP])
+AC_SUBST([GNOME2_DESKTOP])
+AC_SUBST([GNOME_ICON])
+
 AC_SUBST([KDE_DESKTOP])
 AC_SUBST([KDE_ICON])
 

icons/Makefile.am

@@ -1,46 +1,22 @@
 EXTRA_DIST = wesnoth.desktop wesnoth-icon.png
 
 if GNOME1
-if HAS_DESKTOPDIR
-gnome1desktopdir = @DESKTOPDIR@
-else
 gnome1desktopdir = @GNOME1_DESKTOP@
-endif
 dist_gnome1desktop_DATA = wesnoth.desktop
-if HAS_ICONDIR
-gnome1icondir = @ICONDIR@
-else
-gnome1icondir = $(datadir)/icons
-endif
+gnome1icondir = @GNOME_ICON@
 gnome1icon_DATA = wesnoth-icon.png
 endif
 
 if GNOME2
-if HAS_DESKTOPDIR
-gnome2desktopdir = @DESKTOPDIR@
-else
-gnome2desktopdir = $(datadir)/applications
-endif
+gnome2desktopdir = @GNOME2_DESKTOP@
 dist_gnome2desktop_DATA = wesnoth.desktop 
-if HAS_ICONDIR
-gnome2icondir = @ICONDIR@
-else
-gnome2icondir = $(datadir)/icons
-endif
+gnome2icondir = @GNOME_ICON@
 gnome2icon_DATA = wesnoth-icon.png
 endif
 
 if KDE
-if HAS_DESKTOPDIR
-kdedesktopdir = @DESKTOPDIR@
-else
 kdedesktopdir = @KDE_DESKTOP@
-endif
 dist_kdedesktop_DATA = wesnoth.desktop
-if HAS_ICONDIR
-kdeicondir = @ICONDIR@
-else
 kdeicondir = @KDE_ICON@
-endif
 kdeicon_DATA = wesnoth-icon.png
 endif