[lwatch-cvs] files/doc Makefile.am,1.9,1.10 Makefile.in,1.9,1.10

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/lwatch/files/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv5584/doc

Modified Files:
	Makefile.am Makefile.in 
Log Message:
 - configure.ac: first check for components which are required for build,
                 next other tests
 - doc/Makefile.am: proper conditional to make "make dist" and "make install"
                    works
 - other: automagically regenerated


Index: Makefile.am
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	6 Feb 2003 23:34:05 -0000	1.9
--- Makefile.am	7 Feb 2003 09:58:47 -0000	1.10
***************
*** 1,3 ****
! man_MANS = @DOCMAN@
  dist_man_MANS = @DISTMAN@
  EXTRA_DIST = lwatch.sgml
--- 1,5 ----
! if DISTRO
! man_MANS = lwatch.1
! endif
  dist_man_MANS = @DISTMAN@
  EXTRA_DIST = lwatch.sgml
***************
*** 12,16 ****
  	sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
  else
! lwatch.1: lwatch.1.in
  	sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
  endif
--- 14,18 ----
  	sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
  else
! lwatch.1: lwatch.1.in Makefile
  	sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
  endif

Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.in	6 Feb 2003 23:34:05 -0000	1.9
--- Makefile.in	7 Feb 2003 09:58:48 -0000	1.10
***************
*** 116,120 ****
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
! man_MANS = @DOCMAN@
  dist_man_MANS = @DISTMAN@
  EXTRA_DIST = lwatch.sgml
--- 116,120 ----
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
! @DISTRO_TRUE@man_MANS = lwatch.1
  dist_man_MANS = @DISTMAN@
  EXTRA_DIST = lwatch.sgml
***************
*** 125,128 ****
--- 125,131 ----
  CONFIG_CLEAN_FILES =
  DIST_SOURCES =
+ 
+ NROFF = nroff
+ MANS = $(dist_man_MANS) $(man_MANS)
  DIST_COMMON = $(dist_man_MANS) Makefile.am Makefile.in
  all: all-am
***************
*** 135,138 ****
--- 138,188 ----
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  uninstall-info-am:
+ 
+ man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+ 	  case "$$i" in \
+ 	    *.1*) list="$$list $$i" ;; \
+ 	  esac; \
+ 	done; \
+ 	for i in $$list; do \
+ 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ 	  else file=$$i; fi; \
+ 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ 	  case "$$ext" in \
+ 	    1*) ;; \
+ 	    *) ext='1' ;; \
+ 	  esac; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+ 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+ 	  case "$$i" in \
+ 	    *.1*) list="$$list $$i" ;; \
+ 	  esac; \
+ 	done; \
+ 	for i in $$list; do \
+ 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ 	  case "$$ext" in \
+ 	    1*) ;; \
+ 	    *) ext='1' ;; \
+ 	  esac; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+ 	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
  tags: TAGS
  TAGS:
***************
*** 175,181 ****
  check-am: all-am
  check: check-am
! all-am: Makefile
  
  installdirs:
  
  install: install-am
--- 225,232 ----
  check-am: all-am
  check: check-am
! all-am: Makefile $(MANS)
  
  installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
  
  install: install-am
***************
*** 220,224 ****
  info-am:
  
! install-data-am:
  
  install-exec-am:
--- 271,275 ----
  info-am:
  
! install-data-am: install-man
  
  install-exec-am:
***************
*** 226,230 ****
  install-info: install-info-am
  
! install-man:
  
  installcheck-am:
--- 277,281 ----
  install-info: install-info-am
  
! install-man: install-man1
  
  installcheck-am:
***************
*** 246,250 ****
  ps-am:
  
! uninstall-am: uninstall-info-am
  
  .PHONY: all all-am check check-am clean clean-generic distclean \
--- 297,303 ----
  ps-am:
  
! uninstall-am: uninstall-info-am uninstall-man
! 
! uninstall-man: uninstall-man1
  
  .PHONY: all all-am check check-am clean clean-generic distclean \
***************
*** 252,259 ****
  	install-am install-data install-data-am install-exec \
  	install-exec-am install-info install-info-am install-man \
! 	install-strip installcheck installcheck-am installdirs \
! 	maintainer-clean maintainer-clean-generic mostlyclean \
! 	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
! 	uninstall-info-am
  
  
--- 305,312 ----
  	install-am install-data install-data-am install-exec \
  	install-exec-am install-info install-info-am install-man \
! 	install-man1 install-strip installcheck installcheck-am \
! 	installdirs maintainer-clean maintainer-clean-generic \
! 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
! 	uninstall-am uninstall-info-am uninstall-man uninstall-man1
  
  
***************
*** 263,267 ****
  @DISTRO_TRUE@@MAK...@co...: conf.ent.in Makefile
  @DISTRO_TRUE@@MAKE_MAN_TRUE@	sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
! @DISTRO_TRUE@@MAKE_MAN_FALSE@lwatch.1: lwatch.1.in
  @DISTRO_TRUE@@MAKE_MAN_FALSE@	sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
  @DIS...@lw...: lwatch.sgml conf.ent
--- 316,320 ----
  @DISTRO_TRUE@@MAK...@co...: conf.ent.in Makefile
  @DISTRO_TRUE@@MAKE_MAN_TRUE@	sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
! @DISTRO_TRUE@@MAKE_MAN_FALSE@lwatch.1: lwatch.1.in Makefile
  @DISTRO_TRUE@@MAKE_MAN_FALSE@	sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
  @DIS...@lw...: lwatch.sgml conf.ent