[Xfce4-commits] CVS: xfce4/xfce4-icon-theme/Rodent/48x48/filesystems Makefile.am, 1.2, 1.3 Makefile.in, 1.8, 1.9

[Brian J. Tarricone]

dum-de-dum...  shouldn't we be calling AM_PROG_LN (or is it AC_PROG_LN?)
from configure.ac, and then using "$(LN_S)" instead of "ln -sf"?

	-brian


On 12/01/04 11:58, Benedikt Meurer wrote:
> Update of /var/cvs/xfce/xfce4/xfce4-icon-theme/Rodent/48x48/filesystems
> In directory espresso.foo-projects.org:/tmp/cvs-serv20807/Rodent/48x48/filesystems
> 
> Modified Files:
> 	Makefile.am Makefile.in 
> Log Message:
> Solaris fixes.
> 
> Index: Makefile.am
> ===================================================================
> RCS file: /var/cvs/xfce/xfce4/xfce4-icon-theme/Rodent/48x48/filesystems/Makefile.am,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -d -r1.2 -r1.3
> --- Makefile.am	23 Nov 2004 17:28:11 -0000	1.2
> +++ Makefile.am	1 Dec 2004 11:58:00 -0000	1.3
> @@ -16,12 +16,20 @@
>  install-data-local:
>  	$(mkinstalldirs) $(DESTDIR)$(icondir)
>  	( cd $(DESTDIR)$(icondir) ; \
> -	  ln -sf gnome-fs-blockdev.png mime-inode:blockdevice.png ; \
> -	  ln -sf gnome-fs-blockdev.png mime-inode:chardevice.png ; \
> -	  ln -sf gnome-fs-directory.png mime-inode:directory.png ; \
> -	  ln -sf gnome-fs-directory.png mime-inode:mount-point.png ; \
> -	  ln -sf gnome-fs-file-broken.png mime-inode:core.png \
> -	)
> +	  rm -f mime-inode:blockdevice.png ; \
> +	  ln -s gnome-fs-blockdev.png mime-inode:blockdevice.png )
> +	( cd $(DESTDIR)$(icondir) ; \
> +	  rm -f mime-inode:chardevice.png ; \
> +	  ln -s gnome-fs-blockdev.png mime-inode:chardevice.png )
> +	( cd $(DESTDIR)$(icondir) ; \
> +	  rm -f mime-inode:directory.png ; \
> +	  ln -s gnome-fs-directory.png mime-inode:directory.png )
> +	( cd $(DESTDIR)$(icondir) ; \
> +	  rm -f mime-inode:mount-point.png ; \
> +	  ln -s gnome-fs-directory.png mime-inode:mount-point.png )
> +	( cd $(DESTDIR)$(icondir) ; \
> +	  rm -f mime-inode:core.png ; \
> +	  ln -s gnome-fs-file-broken.png mime-inode:core.png )
>  	
>  EXTRA_DIST =  $(icon_DATA)
>  
> 
> Index: Makefile.in
> ===================================================================
> RCS file: /var/cvs/xfce/xfce4/xfce4-icon-theme/Rodent/48x48/filesystems/Makefile.in,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -d -r1.8 -r1.9
> --- Makefile.in	23 Nov 2004 17:28:11 -0000	1.8
> +++ Makefile.in	1 Dec 2004 11:58:00 -0000	1.9
> @@ -1,4 +1,4 @@
> -# Makefile.in generated by automake 1.9.2 from Makefile.am.
> +# Makefile.in generated by automake 1.8.5 from Makefile.am.
>  # @configure_input@
>  
>  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
> @@ -45,12 +45,6 @@
>  CONFIG_CLEAN_FILES =
>  SOURCES =
>  DIST_SOURCES =
> -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
> -am__vpath_adj = case $$p in \
> -    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
> -    *) f=$$p;; \
> -  esac;
> -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
>  am__installdirs = "$(DESTDIR)$(icondir)"
>  iconDATA_INSTALL = $(INSTALL_DATA)
>  DATA = $(icon_DATA)
> @@ -90,8 +84,6 @@
>  VERSION = @VERSION@
>  ac_ct_STRIP = @ac_ct_STRIP@
>  am__leading_dot = @am__leading_dot@
> -am__tar = @am__tar@
> -am__untar = @am__untar@
>  bindir = @bindir@
>  build_alias = @build_alias@
>  datadir = @datadir@
> @@ -164,7 +156,7 @@
>  	test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
>  	@list='$(icon_DATA)'; for p in $$list; do \
>  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
> -	  f=$(am__strip_dir) \
> +	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>  	  echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
>  	  $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
>  	done
> @@ -172,7 +164,7 @@
>  uninstall-iconDATA:
>  	@$(NORMAL_UNINSTALL)
>  	@list='$(icon_DATA)'; for p in $$list; do \
> -	  f=$(am__strip_dir) \
> +	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>  	  echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
>  	  rm -f "$(DESTDIR)$(icondir)/$$f"; \
>  	done
> @@ -236,7 +228,7 @@
>  clean-generic:
>  
>  distclean-generic:
> -	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
> +	-rm -f $(CONFIG_CLEAN_FILES)
>  
>  maintainer-clean-generic:
>  	@echo "This command is intended for maintainers to use"
> @@ -301,12 +293,20 @@
>  install-data-local:
>  	$(mkinstalldirs) $(DESTDIR)$(icondir)
>  	( cd $(DESTDIR)$(icondir) ; \
> -	  ln -sf gnome-fs-blockdev.png mime-inode:blockdevice.png ; \
> -	  ln -sf gnome-fs-blockdev.png mime-inode:chardevice.png ; \
> -	  ln -sf gnome-fs-directory.png mime-inode:directory.png ; \
> -	  ln -sf gnome-fs-directory.png mime-inode:mount-point.png ; \
> -	  ln -sf gnome-fs-file-broken.png mime-inode:core.png \
> -	)
> +	  rm -f mime-inode:blockdevice.png ; \
> +	  ln -s gnome-fs-blockdev.png mime-inode:blockdevice.png )
> +	( cd $(DESTDIR)$(icondir) ; \
> +	  rm -f mime-inode:chardevice.png ; \
> +	  ln -s gnome-fs-blockdev.png mime-inode:chardevice.png )
> +	( cd $(DESTDIR)$(icondir) ; \
> +	  rm -f mime-inode:directory.png ; \
> +	  ln -s gnome-fs-directory.png mime-inode:directory.png )
> +	( cd $(DESTDIR)$(icondir) ; \
> +	  rm -f mime-inode:mount-point.png ; \
> +	  ln -s gnome-fs-directory.png mime-inode:mount-point.png )
> +	( cd $(DESTDIR)$(icondir) ; \
> +	  rm -f mime-inode:core.png ; \
> +	  ln -s gnome-fs-file-broken.png mime-inode:core.png )
>  # Tell versions [3.59,3.63) of GNU make to not export all variables.
>  # Otherwise a system limit (for SysV at least) may be exceeded.
>  .NOEXPORT:
> 
> _______________________________________________
> Xfce4-commits mailing list
> Xfce4-commits at xfce.org
> http://lunar-linux.org/mailman/listinfo/xfce4-commits