From 0482535bf57ff33262f1dbe5c230203ceb9ddcef Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Tue, 21 Aug 2001 04:43:03 +0000
Subject: [PATCH] * doc-gnome/C/figs/Makefile.am: Don't install GNOME-specific
 files if GNOME frontend is disabled. * idl/Makefile.am: Likewise. *
 lib/Makefile.am: Likewise. * new_icons/Makefile.am: Likewise.

---
 ChangeLog                    |  6 ++++++
 doc-gnome/C/Makefile.am      | 12 +++++++-----
 doc-gnome/C/figs/Makefile.am |  2 ++
 idl/Makefile.am              |  8 ++++++--
 lib/Makefile.am              | 10 +++++++---
 new_icons/Makefile.am        |  3 +--
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ff482c92..8a32384d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-08-21  Pavel Roskin  <proski@gnu.org>
 
+	* doc-gnome/C/figs/Makefile.am: Don't install GNOME-specific
+	files if GNOME frontend is disabled.
+	* idl/Makefile.am: Likewise.
+	* lib/Makefile.am: Likewise.
+	* new_icons/Makefile.am: Likewise.
+
 	* autogen.sh: Fall back to aclocal without "-I gettext.m4" in
 	case it already has gettext macros elsewhere and doesn't like
 	duplicates (i.e. it's aclocal from Automake-1.4).
diff --git a/doc-gnome/C/Makefile.am b/doc-gnome/C/Makefile.am
index 5ab1d410a..403957fb7 100644
--- a/doc-gnome/C/Makefile.am
+++ b/doc-gnome/C/Makefile.am
@@ -1,14 +1,13 @@
 SUBDIRS = figs
 
-gmc_helpdir = $(datadir)/gnome/help/gmc/C
-
-gmc_help_DATA = index.html topic.dat
-
 noinst_SCRIPTS = mkhtml
 
 SGML_FILES = gmc.sgml
 
-EXTRA_DIST = topic.dat $(SGML_FILES) $(noinst_SCRIPTS)
+if GNOME
+gmc_helpdir = $(datadir)/gnome/help/gmc/C
+
+gmc_help_DATA = index.html topic.dat
 
 MOSTLYCLEANFILES = *.tex *.log *.aux
 CLEANFILES = gmc.dvi gmc.ps gmc.pdf gmc.rtf
@@ -44,3 +43,6 @@ gmc.ps: gmc.dvi
 
 gmc.pdf: gmc.dvi
 	dvipdf gmc.dvi gmc.pdf
+endif
+
+EXTRA_DIST = topic.dat $(SGML_FILES) $(noinst_SCRIPTS)
diff --git a/doc-gnome/C/figs/Makefile.am b/doc-gnome/C/figs/Makefile.am
index b7e660000..964f97f7e 100644
--- a/doc-gnome/C/figs/Makefile.am
+++ b/doc-gnome/C/figs/Makefile.am
@@ -1,6 +1,8 @@
+if GNOME
 gmc_helpfigdir = $(datadir)/gnome/help/gmc/C/figs
 
 gmc_helpfig_DATA = $(DISTFIGS)
+endif
 
 DISTFIGS = \
 	fileprops.png \
diff --git a/idl/Makefile.am b/idl/Makefile.am
index 9983052c0..aec17cf59 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,5 +1,9 @@
+IDLFILES = FileManager.idl
+
+if GNOME
 idldir = $(prefix)/share/idl
 
-idl_DATA = FileManager.idl
+idl_DATA = $(IDLFILES)
+endif
 
-EXTRA_DIST = $(idl_DATA)
+EXTRA_DIST = $(IDLFILES)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 96ff96710..a4d060747 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,4 @@
 mclibdir   = $(libdir)/mc
-desktopdir = $(mclibdir)/desktop-scripts
 suppbindir = $(mclibdir)/bin
 tidir      = $(mclibdir)/term
 confdir    = $(sysconfdir)
@@ -27,17 +26,22 @@ noinst_SCRIPTS = tdiff
 
 conf_DATA = mc.global
 suppbin_SCRIPTS = mc.csh mc.sh
-desktop_DATA = startup.links README.desktop
 ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
 
+DESKTOP_FILES = startup.links README.desktop
+if GNOME
+desktopdir = $(mclibdir)/desktop-scripts
+desktop_DATA = $(DESKTOP_FILES)
+endif
+
 mclib_DATA = $(LIBFILES_CONST) $(LIBFILES_ADD) $(LIBFILES_OUT) $(LOCALIZED_HELP)
 
 # Files processed by configure don't need to be here
 EXTRA_DIST = \
 	$(LIBFILES_CONST) \
 	$(LOCALIZED_HELP) \
+	$(DESKTOP_FILES) \
 	$(conf_DATA) \
-	$(desktop_DATA) \
 	$(ti_DATA) \
 	$(noinst_DATA) \
 	$(noinst_SCRIPTS) \
diff --git a/new_icons/Makefile.am b/new_icons/Makefile.am
index 4d03e77ab..6da83b015 100644
--- a/new_icons/Makefile.am
+++ b/new_icons/Makefile.am
@@ -1,5 +1,3 @@
-icondir = $(datadir)/pixmaps/mc
-
 ALLICONS =						\
 	gnome-image-bmp.png				\
 	gnome-image-generic.png				\
@@ -80,6 +78,7 @@ ALLICONS =						\
 	gnome-image-x-xfig.png
 
 if GNOME
+icondir = $(datadir)/pixmaps/mc
 icon_DATA = $(ALLICONS)
 else
 icon_DATA =