Changeset 862


Ignore:
Timestamp:
05/15/13 15:12:00 (10 years ago)
Author:
olahaye
Message:

[Makefile] Messages cleanup (avoid displaying \n instead of zreal CR)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/1.0/Makefile

    r859 r862  
    6565        @# Set the correct GANGLIA_PATH.
    6666        @#
    67         @echo "\nUsing $(GANGLIA_ROOT) as Ganglia root installation path. If it's not what"
     67        @echo
     68        @echo "Using $(GANGLIA_ROOT) as Ganglia root installation path. If it's not what"
    6869        @echo "you want, use make GANGLIA_ROOT=/path/to/your/ganglia/root ."
    6970        @sed -e 's|__GANGLIA_ROOT__|$(GANGLIA_ROOT)/|g' web/conf.php.in > web/addons/job_monarch/conf.php
    … …  
    7172        @# Set the correct JOBARCHIVE_RRDS in jobarchve.conf and ganglia conf.php
    7273        @#
    73         @echo "\nUsing $(JOBARCHIVE_RRDS) as jobarchive path to  store rrds files. If it's not what"
     74        @echo
     75        @echo "Using $(JOBARCHIVE_RRDS) as jobarchive path to  store rrds files. If it's not what"
    7476        @echo "you want, use make JOBARCHIVE_RRDS=/path/to/you/jobarchived/rrdsfiles ."
    7577        @sed -i -e 's|/var/lib/jobarchive|$(JOBARCHIVE_RRDS)|g' jobarchived/jobarchived.conf web/addons/job_monarch/conf.php
    … …  
    7779        @# Files in SBIN_DIR
    7880        @#
    79         @echo "\nInstalling jobmond.py and jobarchived.py to $(PREFIX)/sbin"
     81        @echo
     82        @echo "Installing jobmond.py and jobarchived.py to $(PREFIX)/sbin"
    8083        @install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin
    8184        @install -m 0755 jobmond/jobmond.py $(DESTDIR)$(PREFIX)/sbin/
    … …  
    8588        @# Files specific to distros if /etc/sysconfig => rpm else (/etc/default => debian)
    8689        @#
    87         @echo "\nInstalling service files in $(DESTDIR)/etc"
     90        @echo
     91        @echo "Installing service files in /etc"
    8892        @if test -d /etc/sysconfig; then \
    8993                install -m 0755 -d $(DESTDIR)/etc/rc.d/init.d; \
    … …  
    104108        @# Files in /etc
    105109        @#
    106         @echo "\nInstalling config files jobmond.conf jobarchived.conf in $(DESTDIR)/etc"
     110        @echo
     111        @echo "Installing config files jobmond.conf jobarchived.conf in /etc"
    107112        @install -m 0644 jobmond/jobmond.conf $(DESTDIR)/etc
    108113        @install -m 0644 jobarchived/jobarchived.conf $(DESTDIR)/etc
    … …  
    110115        @# Files in /usr/share
    111116        @#
    112         @echo "\nInstalling job_dbase.sql in $(PREFIX)/share/jobarchived"
     117        @echo
     118        @echo "Installing job_dbase.sql in $(PREFIX)/share/jobarchived"
    113119        @install -m 0755 -d $(DESTDIR)$(PREFIX)/share/jobarchived
    114120        @install -m 0755 jobarchived/job_dbase.sql $(DESTDIR)$(PREFIX)/share/jobarchived/
    … …  
    116122        @# Create the /var/lib/jobarchive directory where rrds are stored.
    117123        @#
    118         @echo "\nCreating the directory where RRDs will be stored: $(JOBARCHIVE_RRDS)"
     124        @echo
     125        @echo "Creating the directory where RRDs will be stored: $(JOBARCHIVE_RRDS)"
    119126        @install -m 0755 -d $(DESTDIR)$(JOBARCHIVE_RRDS)
    120127        @#
    121128        @# Files for ganglia
    122129        @#
    123         @echo "\nInstalling Ganglia web interface to $(GANGLIA_ROOT) ."
     130        @echo
     131        @echo "Installing Ganglia web interface to $(GANGLIA_ROOT) ."
    124132        @install -m 0755 -d $(DESTDIR)$(GANGLIA_ROOT)
    125133        @chown -R $(GANGLIA_USER) ./web
    … …  
    129137        @(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php ./addons ./templates $(DESTDIR)$(GANGLIA_ROOT)/)
    130138        @#
    131         @echo "\nInstallation complete.\n"
     139        @echo
     140        @echo "Installation complete."
     141        @echo
    132142
    133143clean:
Note: See TracChangeset for help on using the changeset viewer.