povray-beta/no_user_install.diff

   1 diff -rup povray-3.7.0.RC2/Makefile.am povray-3.7.0.RC2.new//Makefile.am
   2 --- povray-3.7.0.RC2/Makefile.am        2011-01-06 23:40:19.000000000 +0100
   3 +++ povray-3.7.0.RC2.new//Makefile.am   2011-01-08 10:54:21.027908186 +0100
   4 @@ -107,19 +107,8 @@ install-data-local:
   5         for f in $$filelist ; do \
   6           $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
   7         done
   8 -       @echo "Creating user directories..."; \
   9 -       for p in $(povuser) $(povconfuser) ; do \
  10 -         $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
  11 -       done
  12 -       @echo "Copying user configuration and INI files..."; \
  13 -       for f in povray.conf povray.ini ; do \
  14 -         if test -f $(povconfuser)/$$f; then \
  15 -           echo "Creating backup of $(povconfuser)/$$f"; \
  16 -           mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
  17 -         fi; \
  18 -       done; \
  19 -       $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
  20 -       $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
  21 +#      $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
  22 +#      $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
  23
  24  # Remove data, config, and empty folders for 'make uninstall'.
  25  # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).
  26 diff -rup povray-3.7.0.RC2/Makefile.in povray-3.7.0.RC2.new//Makefile.in
  27 --- povray-3.7.0.RC2/Makefile.in        2011-01-06 23:40:24.000000000 +0100
  28 +++ povray-3.7.0.RC2.new//Makefile.in   2011-01-08 10:53:59.658482647 +0100
  29 @@ -1038,19 +1038,8 @@ install-data-local:
  30         for f in $$filelist ; do \
  31           $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
  32         done
  33 -       @echo "Creating user directories..."; \
  34 -       for p in $(povuser) $(povconfuser) ; do \
  35 -         $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
  36 -       done
  37 -       @echo "Copying user configuration and INI files..."; \
  38 -       for f in povray.conf povray.ini ; do \
  39 -         if test -f $(povconfuser)/$$f; then \
  40 -           echo "Creating backup of $(povconfuser)/$$f"; \
  41 -           mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
  42 -         fi; \
  43 -       done; \
  44 -       $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
  45 -       $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
  46 +#      $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf  && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
  47 +#      $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini  && echo "$(povconfuser)/povray.ini" >> $(povinstall)
  48
  49  # Remove data, config, and empty folders for 'make uninstall'.
  50  # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).
  51