Use ln without -s to make links into the real install/lib directory; add

	* nautilus-installer/install-lib/Makefile.am:
	Use ln without -s to make links into the real install/lib directory;
	add header file prerequisites

	* nautilus-installer/libtrilobite/Makefile.am:
	Use ln without -s to make links into the real libtrilobite directory;
	fix header file prerequisites

	* nautilus.spec.in:
	Again, try to build the installer in tinderbox.  With luck, it'll
	actually work this time.

4 files changed, 71 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index ef3d0ffc6..e6c088d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-02-21  Eric Fischer <eric@eazel.com>
+
+	* nautilus-installer/install-lib/Makefile.am:
+	Use ln to make links into the real install/lib directory;
+	add header file prerequisites
+
+	* nautilus-installer/libtrilobite/Makefile.am:
+	Use ln to make links into the real libtrilobite directory;
+	fix header file prerequisites
+
+	* nautilus.spec.in:
+	Again, try to build the installer in tinderbox.  With luck,
+	it'll actually work this time.
+
 2001-02-21  Darin Adler  <darin@eazel.com>
 
 	reviewed by: Pavel Cisler <pavel@eazel.com>
diff --git a/nautilus-installer/install-lib/Makefile.am b/nautilus-installer/install-lib/Makefile.am
index c717e514c..fd009e225 100644
--- a/nautilus-installer/install-lib/Makefile.am
+++ b/nautilus-installer/install-lib/Makefile.am
@@ -29,15 +29,38 @@ INCLUDES=\
 	-I@top_srcdir@						\
 	-I/usr/include/rpm					\
         -I@top_srcdir@/components/services/trilobite		\
+        -I@top_srcdir@/components/services/trilobite/libtrilobite	\
+        -I@top_srcdir@/components/services/install/lib		\
 	@GNOME_CFLAGS@						\
 	@GCONF_CFLAGS@						\
 	@XML_CFLAGS@						\
 	@GHTTP_CFLAGS@						\
 	$(NULL)
 
-$(libeazelinstall_minimal_a_SOURCES):
-	for i in $(top_srcdir)/components/services/install/lib/*.[ch]; \
-	do bn=`basename $$i`; rm -f $$bn; ln -s $$i $$bn; done
+TRILOBITE_HDRS =  \
+	libtrilobite.h \
+	libtrilobite-service.h \
+	trilobite-core-distribution.h \
+	trilobite-core-messaging.h \
+	trilobite-core-network.h \
+	trilobite-core-utils.h \
+	trilobite-file-utilities.h \
+	trilobite-md5-tools.h \
+	trilobite-redirect.h \
+	trilobite-root-client-private.h \
+	trilobite-root-client-public.h \
+	trilobite-root-helper.h \
+	trilobite-service-passwordquery-private.h \
+	trilobite-service-passwordquery-public.h \
+	trilobite-service-private.h \
+	trilobite-service-public.h \
+	$(NULL)
+
+$(TRILOBITE_HDRS):
+	rm -f $@; ln $(top_srcdir)/components/services/trilobite/libtrilobite/`basename $@` $@
+
+$(libeazelinstall_minimal_a_SOURCES) eazel-package-system-rpm4.c eazel-package-system-rpm3.c: $(TRILOBITE_HDRS)
+	rm -f $@; ln $(top_srcdir)/components/services/install/lib/`basename $@` $@
 
 eazel-package-system-rpm4.o: eazel-package-system-rpm4.c
 eazel-package-system-rpm3.o: eazel-package-system-rpm3.c
diff --git a/nautilus-installer/libtrilobite/Makefile.am b/nautilus-installer/libtrilobite/Makefile.am
index 33f84ed22..5469af4c1 100644
--- a/nautilus-installer/libtrilobite/Makefile.am
+++ b/nautilus-installer/libtrilobite/Makefile.am
@@ -15,37 +15,39 @@ libtrilobite_minimal_a_SOURCES =	\
 	trilobite-md5-tools.c		\
 	$(NULL)
 
-HDRS = \
+INCLUDES=							\
+	-DTRILOBITE_VERSION=\"0.1.0\"				\
+	-I.							\
+	-I@top_srcdir@						\
+        -I@top_srcdir@/components/services/trilobite		\
+        -I@top_srcdir@/components/services/trilobite/libtrilobite	\
+	-DTRILOBITE_SLIM 					\
+	-DG_LOG_DOMAIN=\"Nautilus-Installer\"			\
+	@GNOME_CFLAGS@						\
+	@XML_CFLAGS@						\
+	$(NULL)
+
+TRILOBITE_HDRS =  \
 	libtrilobite.h \
 	libtrilobite-service.h \
 	trilobite-core-distribution.h \
 	trilobite-core-messaging.h \
 	trilobite-core-network.h \
 	trilobite-core-utils.h \
+	trilobite-file-utilities.h \
 	trilobite-md5-tools.h \
 	trilobite-redirect.h \
 	trilobite-root-client-private.h \
 	trilobite-root-client-public.h \
 	trilobite-root-helper.h \
-	trilobite-service.h \
 	trilobite-service-passwordquery-private.h \
 	trilobite-service-passwordquery-public.h \
 	trilobite-service-private.h \
 	trilobite-service-public.h \
 	$(NULL)
 
-INCLUDES=							\
-	-DTRILOBITE_VERSION=\"0.1.0\"				\
-	-I.							\
-	-I@top_srcdir@						\
-        -I@top_srcdir@/components/services/trilobite		\
-	-DTRILOBITE_SLIM 					\
-	-DG_LOG_DOMAIN=\"Nautilus-Installer\"			\
-	@GNOME_CFLAGS@						\
-	@XML_CFLAGS@						\
-	$(NULL)
-
-$(libtrilobite_minimal_a_SOURCES) $(HDRS):
-	for i in $(top_srcdir)/components/services/trilobite/libtrilobite/*.[ch]; \
-	do bn=`basename $$i`; rm -f $$bn; ln -s $$i $$bn; done
+$(TRILOBITE_HDRS):
+	rm -f $@; ln $(top_srcdir)/components/services/trilobite/libtrilobite/`basename $@` $@
 
+$(libtrilobite_minimal_a_SOURCES): $(TRILOBITE_HDRS)
+	rm -f $@; ln $(top_srcdir)/components/services/trilobite/libtrilobite/`basename $@` $@
diff --git a/nautilus.spec.in b/nautilus.spec.in
index 0ed0139f5..83374f19a 100644
--- a/nautilus.spec.in
+++ b/nautilus.spec.in
@@ -68,6 +68,10 @@ Summary:	Extra goodies to use with Nautilus
 Group:          User Interface/Desktop
 Requires:	xpdf >= 0.90
 
+%package installer
+Summary:	The Eazel Installer
+Group:          User Interface/Desktop
+
 %package suggested
 Summary:	Nautilus and a suggested set of components
 Group:          User Interface/Desktop
@@ -97,6 +101,9 @@ Nautilus, and getting multimedia to work, such as eog and mpg123.
 %description extras
 This is a meta-package that requires useful add-ons for Nautilus.
 
+%description installer
+The Eazel installer
+
 %changelog
 * Tue Oct 10 2000 Robin Slomkowski <rslomkow@eazel.com>
 - removed obsoletes from sub packages and added mozilla and trilobite
@@ -122,6 +129,7 @@ export LC_ALL LINGUAS LANG
 ## continuation character, or else the rpm demons will eat you.
 CFLAGS="$RPM_OPT_FLAGS -DENABLE_SCROLLKEEPER_SUPPORT" ./configure $MYARCH_FLAGS --prefix=%{prefix} \
 	--enable-eazel-services \
+	--enable-installer \
 	--enable-more-warnings \
 	--sysconfdir=%{sysconfdir}
 
@@ -317,6 +325,11 @@ fi
 %defattr(0444, bin, bin)
 %{prefix}/share/nautilus/nautilus-extras.placeholder
 
+%files installer
+
+%defattr(0555, bin, bin)
+%{prefix}/bin/eazel-installer.sh
+
 %files suggested
 
 %defattr(0444, bin, bin)