diff options
| author | Dan Mueth <dan@eazel.com> | 2001-02-27 03:41:24 +0000 |
|---|---|---|
| committer | Dan Mueth <dmueth@src.gnome.org> | 2001-02-27 03:41:24 +0000 |
| commit | 321c74d1599801735cbf3322dd0e73c3668fc092 (patch) | |
| tree | 085a4b417449a00d48863f0f31024b68d80cecf6 | |
| parent | 65b1fd161e15646ae9396b520d19ec43fdc34570 (diff) | |
| download | nautilus-321c74d1599801735cbf3322dd0e73c3668fc092.tar.gz | |
reviewed by: Eric Fischer <eric@eazel.com>
2001-02-26 Dan Mueth <dan@eazel.com>
reviewed by: Eric Fischer <eric@eazel.com>
Added a timestamp file so that OMF files only get
built at build time and not at install time.
* help/docs.make:
* help/htmldocs.make:
Added explicit dependency on ScrollKeeper and added
"make -k ; make test" in place of "make -k test".
* nautilus.spec.in:
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | help/docs.make | 7 | ||||
| -rw-r--r-- | help/htmldocs.make | 8 | ||||
| -rw-r--r-- | nautilus.spec.in | 5 |
4 files changed, 28 insertions, 5 deletions
@@ -1,3 +1,16 @@ +2001-02-26 Dan Mueth <dan@eazel.com> + + reviewed by: Eric Fischer <eric@eazel.com> + + Added a timestamp file so that OMF files only get + built at build time and not at install time. + * help/docs.make: + * help/htmldocs.make: + + Added explicit dependency on ScrollKeeper and added + "make -k ; make test" in place of "make -k test". + * nautilus.spec.in: + 2001-02-26 Andy Hertzfeld <andy@eazel.com> * data/linksets/home.xml: diff --git a/help/docs.make b/help/docs.make index 553232197..d16a1d8f6 100644 --- a/help/docs.make +++ b/help/docs.make @@ -7,12 +7,17 @@ omf_dir=$(top_srcdir)/omf-install EXTRA_DIST = $(docname).sgml $(help_DATA) $(omffiles) $(figs) +CLEANFILES = omf_timestamp + all: index.html omf -omf: $(omffiles) +omf: omf_timestamp + +omf_timestamp: $(omffiles) -for omffile in $(omffiles); do \ scrollkeeper-preinstall $(helpdir)/$(docname).sgml $$omffile $(omf_dir)/$$omffile; \ done + touch omf_timestamp index.html: $(docname)/index.html -cp $(docname)/index.html . diff --git a/help/htmldocs.make b/help/htmldocs.make index 125a8f5a3..44ba89fb4 100644 --- a/help/htmldocs.make +++ b/help/htmldocs.make @@ -5,12 +5,17 @@ omf_dir=$(top_srcdir)/omf-install EXTRA_DIST = $(htmls) $(omffiles) $(figs) +CLEANFILES = omf_timestamp + all: omf -omf: $(omffiles) +omf: omf_timestamp + +omf_timestamp: $(omffiles) -for omffile in $(omffiles); do \ scrollkeeper-preinstall $(DESTDIR)$(helpdir)/index.html $$omffile $(omf_dir)/$$omffile; \ done + touch omf_timestamp app-dist-hook: -$(mkinstalldirs) $(distdir)/figures @@ -30,4 +35,3 @@ install-data-am: omf $(INSTALL_DATA) $$file $(DESTDIR)$(helpdir)/figures/$$basefile; \ done - diff --git a/nautilus.spec.in b/nautilus.spec.in index b33a9dcda..59172c12b 100644 --- a/nautilus.spec.in +++ b/nautilus.spec.in @@ -34,7 +34,7 @@ Requires: freetype >= 2.0 Requires: medusa >= 0.2.2 Requires: esound >= 0.2 Requires: libghttp >= 1.0.9 -# Requires: scrollkeeper >= 0.1.0 +Requires: scrollkeeper >= 0.1.0 %description Nautilus integrates access to files, applications, media, Internet-based @@ -126,7 +126,8 @@ CFLAGS="$RPM_OPT_FLAGS -DENABLE_SCROLLKEEPER_SUPPORT" ./configure $MYARCH_FLAGS --enable-more-warnings \ --sysconfdir=%{sysconfdir} -make -k check +make -k +make check %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT |