Diff for /loncom/build/Makefile between versions 1.198 and 1.202

version 1.198, 2011/11/02 13:16:23 version 1.202, 2013/07/22 22:17:58
Line 56  help: Line 56  help:
   
 help_OPTIONS:  help_OPTIONS:
  @echo "* ADJUSTABLE OPTIONS *"   @echo "* ADJUSTABLE OPTIONS *"
  @echo "(option) DIST can be redhat7, debian, redhat6.2, or default"   @echo "(option) DIST can be centosN (N = 5 or 6), rhesN (N = 4, 5 or 6),"
  @echo "         You probably do not need to specify this; it is"   @echo "         or scientificN (N = 4 or 5), or slesN (N = 9,10 or 11),"
  @echo "         automatically probed for."   @echo "         or ubuntuN (N= 6, 8, 10 or 12), or fedoraN (N = 1 .. 19)," 
    @echo "         or suseN.M (N.M: 9.2 ... 12.3), or debianN (N = 5 or 6),"
    @echo "         or default.  It is unlikely you would ever need to specify"
    @echo "         this, as it is automatically probed for."
  @echo "(option) CATEGORY can be 'runtime' or 'development'; currently"   @echo "(option) CATEGORY can be 'runtime' or 'development'; currently"
  @echo "         the 'development' setting is the most reliable;"   @echo "         the 'development' setting is the most reliable;"
  @echo "         eventually, production machines should be using the"   @echo "         eventually, production machines should be using the"
Line 136  help_TARGETS: Line 139  help_TARGETS:
  @echo "    nohist_reseval.db to nohist_accesscount.db."   @echo "    nohist_reseval.db to nohist_accesscount.db."
  @echo "modify_config_files: Perform automatic update of the "   @echo "modify_config_files: Perform automatic update of the "
  @echo "    configuration files for yum and MySQL."   @echo "    configuration files for yum and MySQL."
    @echo "langcheck: test to see if root bash and OS are using English."
  @echo "ntpcheck: test to see if ntp is installed and running."   @echo "ntpcheck: test to see if ntp is installed and running."
  @echo "html_parser_check: test functionality of HTML::Parser."   @echo "html_parser_check: test functionality of HTML::Parser."
  @echo "math_random_check: test functionality of Math::Random."   @echo "math_random_check: test functionality of Math::Random."
Line 545  postinstall: Line 549  postinstall:
  make picins_check   make picins_check
  make mimetex_version_check   make mimetex_version_check
  make verify_domconfiguser   make verify_domconfiguser
  make latex_fmtutil    make latex_fmtutil
    sed -i "s/\x08\x08*/.../g" WARNINGS
 VERSION:  VERSION:
  install -d $(TARGET)/etc   install -d $(TARGET)/etc
  echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release   echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
Line 557  VERSION: Line 562  VERSION:
 aboutVERSION:  aboutVERSION:
  cp -p -v $(SOURCE)/loncom/license/about.html \   cp -p -v $(SOURCE)/loncom/license/about.html \
  $(SOURCE)/loncom/license/about.html.orig   $(SOURCE)/loncom/license/about.html.orig
  cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \  
  $(SOURCE)/loncom/loncapa_apache.conf.orig  
  cat $(SOURCE)/loncom/license/about.html | \   cat $(SOURCE)/loncom/license/about.html | \
  perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \   perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \
  $(SOURCE)/loncom/license/about.html.new   $(SOURCE)/loncom/license/about.html.new
  mv -v $(SOURCE)/loncom/license/about.html.new \   mv -v $(SOURCE)/loncom/license/about.html.new \
  $(SOURCE)/loncom/license/about.html   $(SOURCE)/loncom/license/about.html
    touch --date="$(shell echo `perl getcvsdate.pl \
    $(SOURCE)/loncom/license/CVS/Entries about.html`)" \
    $(SOURCE)/loncom/license/about.html
    cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \
    $(SOURCE)/loncom/loncapa_apache.conf.orig
  cat $(SOURCE)/loncom/loncapa_apache.conf | \   cat $(SOURCE)/loncom/loncapa_apache.conf | \
  perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \   perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \
  $(SOURCE)/loncom/loncapa_apache.conf.new   $(SOURCE)/loncom/loncapa_apache.conf.new
  mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \   mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
  $(SOURCE)/loncom/loncapa_apache.conf   $(SOURCE)/loncom/loncapa_apache.conf
    touch --date="$(shell echo `perl getcvsdate.pl \
    $(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \
    $(SOURCE)/loncom/loncapa_apache.conf
   
 postaboutVERSION:  postaboutVERSION:
  if (test -e $(SOURCE)/loncom/license/about.html.orig) && \   if (test -e $(SOURCE)/loncom/license/about.html.orig) && \
  (diff $(SOURCE)/loncom/license/about.html \   (diff $(SOURCE)/loncom/license/about.html.orig \
  $(SOURCE)/loncom/license/about.html > /dev/null); then \   $(SOURCE)/loncom/license/about.html > /dev/null); then \
  mv -v $(SOURCE)/loncom/license/about.html.orig \   mv -v $(SOURCE)/loncom/license/about.html.orig \
  $(SOURCE)/loncom/license/about.html; \   $(SOURCE)/loncom/license/about.html; \
  elif (test -e $(SOURCE)/loncom/license/about.html.orig) && \   elif (test -e $(SOURCE)/loncom/license/about.html.orig) && \
  !(diff $(SOURCE)/loncom/license/about.html \   !(diff $(SOURCE)/loncom/license/about.html.orig \
  $(SOURCE)/loncom/license/about.html > /dev/null); then \   $(SOURCE)/loncom/license/about.html > /dev/null); then \
  rm -f $(SOURCE)/loncom/license/about.html.orig; \   rm -f $(SOURCE)/loncom/license/about.html.orig; \
  fi   fi
    touch --date="$(shell echo `perl getcvsdate.pl \
    $(SOURCE)/loncom/license/CVS/Entries about.html`)" \
    $(SOURCE)/loncom/license/about.html
  if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \   if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
  (diff $(SOURCE)/loncom/license/about.html \   (diff $(SOURCE)/loncom/loncapa_apache.conf.orig \
  $(SOURCE)/loncom/license/about.html > /dev/null); then \   $(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \
  mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \   mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
  $(SOURCE)/loncom/loncapa_apache.conf; \   $(SOURCE)/loncom/loncapa_apache.conf; \
  elif (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \   elif (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
  !(diff $(SOURCE)/loncom/license/about.html \   !(diff $(SOURCE)/loncom/loncapa_apache.conf.orig \
  $(SOURCE)/loncom/license/about.html > /dev/null); then \   $(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \
  rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \   rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \
  fi   fi
    touch --date="$(shell echo `perl getcvsdate.pl \
    $(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \
    $(SOURCE)/loncom/loncapa_apache.conf
   
 # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***  # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
   

Removed from v.1.198  
changed lines
  Added in v.1.202


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>