$NetBSD: patch-ad,v 1.19 2005/09/18 23:26:01 wiz Exp $

--- driver/Makefile.in.orig	2005-06-23 01:02:23.000000000 +0000
+++ driver/Makefile.in
@@ -222,7 +222,7 @@ HDRS		= XScreenSaver_ad.h XScreenSaver_X
 		  xscreensaver.h prefs.h remote.h \
 		  demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
 		  demo-Gtk-conf.h
-MEN_1		= xscreensaver.man xscreensaver-demo.man \
+MEN_1		= xscreensaver.man \
 		  xscreensaver-command.man \
 		  xscreensaver-text.man \
 		  xscreensaver-getimage.man \
@@ -253,7 +253,7 @@ all: $(EXES) $(EXES2)
 tests: $(TEST_EXES)
 
 install:   install-program   install-ad    install-scripts \
-	   install-gnome     install-man   install-xml install-pam
+	   install-gnome     install-man   install-xml
 uninstall: uninstall-program uninstall-ad  \
 	   uninstall-gnome   uninstall-man uninstall-xml  
 
@@ -288,7 +288,7 @@ install-program: $(EXES)
 	fi ;								      \
 	echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \
 	$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
-	@for exe in xscreensaver-command xscreensaver-demo	           \
+	@for exe in xscreensaver-command			           \
 		    xscreensaver-getimage @EXES_OSX@ ; do	           \
 	  echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
 	       $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
@@ -482,7 +482,7 @@ install-pam:
 
 # screensaver-properties.desktop
 # into /usr/share/applications/
-install-gnome:: screensaver-properties.desktop
+xxxinstall-gnome:: screensaver-properties.desktop
 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
 	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
 	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
@@ -514,7 +514,7 @@ install-gnome:: $(LOGO)
 # ../utils/images/screensaver-*.png
 # into /usr/share/xscreensaver/glade/
 install-gnome::
-	@if [ "$(GTK_GLADEDIR)" != "" ]; then                                 \
+	@if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then       \
            if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then               \
              echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
                   $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
@@ -531,7 +531,7 @@ install-gnome::
 # xscreensaver-demo.glade2
 # into /usr/share/xscreensaver/glade/
 install-gnome:: xscreensaver-demo.glade2
-	@if [ "$(GTK_GLADEDIR)" != "" ]; then				      \
+	@if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then       \
 	  if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then		      \
 	    echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"	     ;\
 	         $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"	     ;\