Gentoo Attachment #78514 for bug #115189

View | Details | Raw Unified
Collapse All | Expand All

(-) torque-2.0.0p2.orig/buildutils/mkincludes/lib.mk.in (-2 / +2 lines)

Lines 16-22	Link Here

install:: $(TARGET)

install:: $(TARGET)

	@# a two step process is best to work around broken installs

	@# a two step process is best to work around broken installs

	$(INSTALL) -d $(libdir) && \

	$(INSTALL) -d $(DESTDIR)$(libdir) && \

	$(INSTALL) -m 644 $(TARGET) $(libdir)/$(TARGET)

	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)

# END lib.mk

# END lib.mk

(-) torque-2.0.0p2.orig/buildutils/pbs_mkdirs.in (-4 / +7 lines)

Lines 140-145	Link Here

	# dlist will contain a list of directory names to make

	# dlist will contain a list of directory names to make

	id_dlist=""

	id_dlist=""

	id_dname=${DESTDIR}$id_dname

	while [ ! \( -z "$id_dname" -o "$id_dname" = / -o \

	while [ ! \( -z "$id_dname" -o "$id_dname" = / -o \

		"$id_dname" = "." \) ]; do

		"$id_dname" = "." \) ]; do

Lines 188-202	Link Here

		echo $idv_dvarname exists and is not a directory 1>&2

		echo $idv_dvarname exists and is not a directory 1>&2

		return 1

		return 1

	elif [ -d $idv_dname ] ; then

	elif [ -d $idv_dname ] ; then

		chmod $idv_mode $idv_dname

		chmod $idv_mode ${DESTDIR}$idv_dname > /dev/null 2>&1

		test -n "$idv_owner" && chown $idv_owner $idv_dname

		test -n "$idv_owner" && chown $idv_owner ${DESTDIR}$idv_dname > /dev/null 2>&1

		return 0

		return 0

	elif [ ! -d $idv_dname ] ; then

	elif [ ! -d $idv_dname ] ; then

		test -n "$verbose" && echo Creating $idv_dname

		test -n "$verbose" && echo Creating $idv_dname

		install_dir `dirname $idv_dname` 755 $idv_owner && \

		install_dir `dirname $idv_dname` 755 $idv_owner && \

		    mkdir $idv_dname && chmod $idv_mode $idv_dname || return 1

		    mkdir ${DESTDIR}$idv_dname && chmod $idv_mode ${DESTDIR}$idv_dname || return 1

		if test -n "$idv_owner"; then

		if test -n "$idv_owner"; then

			chown $idv_owner $idv_name || return 1

			chown $idv_owner ${DESTDIR}$idv_name || return 1

fi

fi

fi

fi

Lines 207-212	Link Here

check_env()

check_env()

	test -n "$verbose" && echo Making environment file

	test -n "$verbose" && echo Making environment file

	PBS_ENVIRON="${DESTDIR}${PBS_ENVIRON}"

	if [ ! -f $PBS_ENVIRON ] ; then

	if [ ! -f $PBS_ENVIRON ] ; then

		install_dir `dirname $PBS_ENVIRON`

		install_dir `dirname $PBS_ENVIRON`

		echo "PATH=/bin:/usr/bin" > $PBS_ENVIRON

		echo "PATH=/bin:/usr/bin" > $PBS_ENVIRON

Lines 324-329	Link Here

        #  if default already exists, leave alone

        #  if default already exists, leave alone

	# solaris fails on '-e', use '-f'

	# solaris fails on '-e', use '-f'

	PBS_DEFAULT_FILE="${DESTDIR}${PBS_DEFAULT_FILE}"

	if [ ! -f $PBS_DEFAULT_FILE ]; then

	if [ ! -f $PBS_DEFAULT_FILE ]; then

	    rm -f $PBS_DEFAULT_FILE > /dev/null 2>&1

	    rm -f $PBS_DEFAULT_FILE > /dev/null 2>&1

	    echo $PBS_DEFAULT_SERVER > $PBS_DEFAULT_FILE && \

	    echo $PBS_DEFAULT_SERVER > $PBS_DEFAULT_FILE && \

(-) torque-2.0.0p2.orig/doc/Makefile.in (-21 / +21 lines)

Lines 196-244	Link Here

install1:	${MAN1}

install1:	${MAN1}

	@echo Installing section 1 man pages

	@echo Installing section 1 man pages

	@$(INSTALL) -d -m 755 $(PBS_MAN) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \

	$(INSTALL) -d -m 755 $(PBS_MAN1) && \

	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN1) && \

	for t in $?; do \

	for t in $?; do \

		tt=`basename $$t B`; \

		tt=`basename $$t B`; \

		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \

		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \

		chmod 644 ${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \

		chmod 644 $(DESTDIR)${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \

	done

	done

install3: $(MAN3)

install3: $(MAN3)

	@echo Installing section 3 man pages

	@echo Installing section 3 man pages

	@$(INSTALL) -d -m 755 $(PBS_MAN) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \

	$(INSTALL) -d -m 755 $(PBS_MAN3) && \

	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN3) && \

	for t in $?; do \

	for t in $?; do \

		tt=`basename $$t B`; \

		tt=`basename $$t B`; \

		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \

		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \

		chmod 644 ${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \

		chmod 644 $(DESTDIR)${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \

	done

	done

install7: $(MAN7)

install7: $(MAN7)

	@echo Installing section 7 man pages

	@echo Installing section 7 man pages

	@$(INSTALL) -d -m 755 $(PBS_MAN) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \

	$(INSTALL) -d -m 755 $(PBS_MAN7) && \

	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN7) && \

	for t in $?;  do \

	for t in $?;  do \

		tt=`basename $$t B`; \

		tt=`basename $$t B`; \

		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \

		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \

		chmod 644 ${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \

		chmod 644 $(DESTDIR)${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \

	done

	done

	@rm -f ${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX)

	@rm -f $(DESTDIR)${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX)

	@if test -f ${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) ;then \

	@if test -f $(DESTDIR)${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) ;then \

		ln ${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) ${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX); \

		ln $(DESTDIR)${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) $(DESTDIR)${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX); \

fi

fi

install8: $(MAN8)

install8: $(MAN8)

	@echo Installing section 8 man pages

	@echo Installing section 8 man pages

	@$(INSTALL) -d -m 755 $(PBS_MAN) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \

	$(INSTALL) -d -m 755 $(PBS_MAN8) && \

	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN8) && \

	for t in $?; do \

	for t in $?; do \

		tt=`basename $$t B`; \

		tt=`basename $$t B`; \

		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \

		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \

		chmod 644 ${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \

		chmod 644 $(DESTDIR)${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \

	done

	done

	@rm -f ${PBS_MAN8}/pbs_sched.8$(MAN_SUFFIX)

	@rm -f $(DESTDIR)${PBS_MAN8}/pbs_sched.8$(MAN_SUFFIX)

	@case ${SCHD_TYPE} in cc|tcl|basl) ln ${PBS_MAN8}/pbs_sched_${SCHD_TYPE}.8$(MAN_SUFFIX) ${PBS_MAN8}/pbs_sched.8$(MAN_SUFFIX);; esac

	@case ${SCHD_TYPE} in cc|tcl|basl) ln $(DESTDIR)${PBS_MAN8}/pbs_sched_${SCHD_TYPE}.8$(MAN_SUFFIX) $(DESTDIR)${PBS_MAN8}/pbs_sched.8$(MAN_SUFFIX);; esac

depend::

depend::

(-) torque-2.0.0p2.orig/src/cmds/Makefile.in (-3 / +3 lines)

Lines 135-146	Link Here

	$(PBS_MKDIRS) clients

	$(PBS_MKDIRS) clients

	$(PBS_MKDIRS) aux

	$(PBS_MKDIRS) aux

	$(PBS_MKDIRS) default

	$(PBS_MKDIRS) default

	$(INSTALL) -d -m 755 $(bindir) && \

	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir) && \

	for f in $(USER) $(OPER) $(ADMN) $(SCRIPTS) ; do \

	for f in $(USER) $(OPER) $(ADMN) $(SCRIPTS) ; do \

	    $(INSTALL) -m 755 $$f $(bindir)/$$f ; \

	    $(INSTALL) -m 755 $$f $(DESTDIR)$(bindir)/$$f ; \

	done

	done

	for f in $(SUPP) ; do \

	for f in $(SUPP) ; do \

	    $(INSTALL) -m 755 $$f $(sbindir)/$$f ; \

	    $(INSTALL) -m 755 $$f $(DESTDIR)$(sbindir)/$$f ; \

	done

	done

(-) torque-2.0.0p2.orig/src/gui/Ccode/Makefile.in (-2 / +2 lines)

Lines 115-123	Link Here

build: $(TARGETS)

build: $(TARGETS)

install: build

install: build

	-test -d $(XPBS_LIB)/bin || $(INSTALL) -d $(XPBS_LIB)/bin

	-test -d $(DESTDIR)$(XPBS_LIB)/bin || $(INSTALL) -d $(DESTDIR)$(XPBS_LIB)/bin

	for f in $(TARGETS); do \

	for f in $(TARGETS); do \

	    $(INSTALL) -m 755 $$f $(XPBS_LIB)/bin; \

	    $(INSTALL) -m 755 $$f $(DESTDIR)$(XPBS_LIB)/bin; \

	done

	done

DFLT_ACTION = $(CC) $(CFLAGS) $@.o -o $@ $(LIBRARIES)

DFLT_ACTION = $(CC) $(CFLAGS) $@.o -o $@ $(LIBRARIES)

(-) torque-2.0.0p2.orig/src/gui/Makefile.in (-10 / +10 lines)

Lines 133-166	Link Here

	@MAKE_POSIX_PLUS@@echo Making in Ccode for xpbs; cd Ccode; $(MAKE) all

	@MAKE_POSIX_PLUS@@echo Making in Ccode for xpbs; cd Ccode; $(MAKE) all

install: build

install: build

	test -d $(XPBS_LIB) || $(INSTALL) -m 755 -d $(XPBS_LIB)

	test -d $(DESTDIR)$(XPBS_LIB) || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)

	test -d $(XPBS_LIB)/bitmaps || $(INSTALL) -m 755 -d $(XPBS_LIB)/bitmaps

	test -d $(DESTDIR)$(XPBS_LIB)/bitmaps || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)/bitmaps

	test -d $(XPBS_LIB)/help || $(INSTALL) -m 755 -d $(XPBS_LIB)/help

	test -d $(DESTDIR)$(XPBS_LIB)/help || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)/help

	for f in $(srcdir)/bitmaps/*; do \

	for f in $(srcdir)/bitmaps/*; do \

	    test -f $$f && $(INSTALL) -m 644 $$f $(XPBS_LIB)/bitmaps; \

	    test -f $$f && $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB)/bitmaps; \

	done

	done

	for f in $(srcdir)/help/*.hlp; do \

	for f in $(srcdir)/help/*.hlp; do \

	    $(INSTALL) -m 644 $$f $(XPBS_LIB)/help; \

	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB)/help; \

	done

	done

	@cd Ccode; $(MAKE) install

	@cd Ccode; $(MAKE) install

	for f in $(srcdir)/*.tcl $(srcdir)/*.tk; do \

	for f in $(srcdir)/*.tcl $(srcdir)/*.tk; do \

	    $(INSTALL) -m 644 $$f $(XPBS_LIB); \

	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB); \

	done

	done

	# install xpbs changing the location of libdir and appdefdir

	# install xpbs changing the location of libdir and appdefdir

	@echo Install xpbs

	@echo Install xpbs

	$(INSTALL) -m 755 xpbs $(bindir)/xpbs

	$(INSTALL) -m 755 xpbs $(DESTDIR)$(bindir)/xpbs

	@chmod 755 $(bindir)/xpbs 2> /dev/null

	@chmod 755 $(bindir)/xpbs 2> /dev/null

	$(INSTALL) -m 755 buildindex $(XPBS_LIB)

	$(INSTALL) -m 755 buildindex $(DESTDIR)$(XPBS_LIB)

	$(INSTALL) -m 644 xpbsrc $(XPBS_LIB)

	$(INSTALL) -m 644 xpbsrc $(DESTDIR)$(XPBS_LIB)

	cd $(XPBS_LIB) && ./buildindex $(XPBS_LIB) && chmod 644 tclIndex

	cd $(DESTDIR)$(XPBS_LIB) && ./buildindex . && chmod 644 tclIndex

distclean clean::

distclean clean::

(-) torque-2.0.0p2.orig/src/iff/Makefile.in (-2 / +2 lines)

Lines 110-117	Link Here

build: $(TARGET)

build: $(TARGET)

install: $(TARGET)

install: $(TARGET)

	@$(INSTALL) -d -m 755 $(sbindir) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \

	$(INSTALL) -m 4755 $(TARGET) $(sbindir)

	$(INSTALL) -m 4755 $(TARGET) $(DESTDIR)$(sbindir)

pbs_iff: $(OBJS) $(PBS_LIBS)

pbs_iff: $(OBJS) $(PBS_LIBS)

	$(CC) $(CFLAGS) -o $@ $(OBJS) $(PBS_LIBS) $(LIBS)

	$(CC) $(CFLAGS) -o $@ $(OBJS) $(PBS_LIBS) $(LIBS)

(-) torque-2.0.0p2.orig/src/include/Makefile.in (-2 / +2 lines)

Lines 146-154	Link Here

install:

install:

	@$(INSTALL) -d -m 755 $(includedir) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(includedir) && \

	for f in $(USERH); do \

	for f in $(USERH); do \

	    $(INSTALL) -m 444 $$f $(includedir); \

	    $(INSTALL) -m 444 $$f $(DESTDIR)$(includedir); \

	done

	done

clean::

clean::

(-) torque-2.0.0p2.orig/src/mom_rcp/Makefile.in (-2 / +2 lines)

Lines 111-118	Link Here

build: $(TARGET)

build: $(TARGET)

install: $(TARGET)

install: $(TARGET)

	$(INSTALL) -d $(sbindir)

	$(INSTALL) -d $(DESTDIR)$(sbindir)

	$(INSTALL) -m 4755 $(TARGET) $(sbindir)

	$(INSTALL) -m 4755 $(TARGET) $(DESTDIR)$(sbindir)

$(TARGET): $(OBJS)

$(TARGET): $(OBJS)

	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)

	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)

(-) torque-2.0.0p2.orig/src/resmom/Makefile.in (-2 / +2 lines)

Lines 142-149	Link Here

install: build

install: build

	$(PBS_MKDIRS) mom

	$(PBS_MKDIRS) mom

	$(PBS_MKDIRS) aux

	$(PBS_MKDIRS) aux

	@$(INSTALL) -d -m 755 $(sbindir) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \

	$(INSTALL) -m 700 $(TARGET) $(sbindir)

	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)

pbs_mom: $(OBJS) $(PBSLIBS)

pbs_mom: $(OBJS) $(PBSLIBS)

	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS) $(MOMLIBS)

	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS) $(MOMLIBS)

(-) torque-2.0.0p2.orig/src/scheduler.basl/Makefile.in (-4 / +4 lines)

Lines 124-133	Link Here

build: $(TARGETS)

build: $(TARGETS)

install: build

install: build

	$(INSTALL) -d -m 755 $(bindir) &&    \

	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir) &&    \

	$(INSTALL) -m 755 basl2c $(bindir) ; \

	$(INSTALL) -m 755 basl2c $(DESTDIR)$(bindir) ; \

	$(INSTALL) -d -m 755 $(sbindir) &&   \

	$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) &&   \

	$(INSTALL) -m 700 pbs_sched $(sbindir)

	$(INSTALL) -m 700 pbs_sched $(DESTDIR)$(sbindir)

basl2c: $(OBJS_COMMON) $(OBJS_COMP)

basl2c: $(OBJS_COMMON) $(OBJS_COMP)

	$(CC) $(CFLAGS) -o $@ $(OBJS_COMMON) $(OBJS_COMP) $(LIBRARIES)

	$(CC) $(CFLAGS) -o $@ $(OBJS_COMMON) $(OBJS_COMP) $(LIBRARIES)

(-) torque-2.0.0p2.orig/src/scheduler.cc/Makefile.in (-2 / +2 lines)

Lines 123-130	Link Here

install: build

install: build

	@MAKE_POSIX_PLUS@@cd $(SCHD_BUILD) && $(MAKE) install

	@MAKE_POSIX_PLUS@@cd $(SCHD_BUILD) && $(MAKE) install

	@$(INSTALL) -d -m 755 $(sbindir) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \

	$(INSTALL) -m 700 $(TARGET) $(sbindir)

	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)

$(TARGET): $(OBJS) $(SCHEDLIB)

$(TARGET): $(OBJS) $(SCHEDLIB)

	$(CC) $(CFLAGS) -o $@ $(OBJS) $(SCHEDLIB) $(PBSLIBS) $(LIBS)

	$(CC) $(CFLAGS) -o $@ $(OBJS) $(SCHEDLIB) $(PBSLIBS) $(LIBS)

(-) torque-2.0.0p2.orig/src/scheduler.cc/samples/cray_t3e/Makefile.in (-4 / +4 lines)

Lines 161-171	Link Here

install:: $(TARGET)

install:: $(TARGET)

	@# a two step process is best to work around broken installs

	@# a two step process is best to work around broken installs

	$(INSTALL) -d $(libdir) && \

	$(INSTALL) -d $(DESTDIR)$(libdir) && \

	$(INSTALL) -m 644 $(TARGET) $(libdir)/$(TARGET)

	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)

	@for f in $(SCHD_CONFIGS); do \

	@for f in $(SCHD_CONFIGS); do \

		test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \

		test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \

		$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \

		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \

	done

	done

@mk_cleanup@

@mk_cleanup@

(-) torque-2.0.0p2.orig/src/scheduler.cc/samples/dec_cluster/Makefile.in (-2 / +2 lines)

Lines 109-116	Link Here

install::

install::

	@echo Installing scheduler config file

	@echo Installing scheduler config file

	@for f in $(SCHD_CONFIG); do \

	@for f in $(SCHD_CONFIG); do \

	    test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \

	    test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \

	        $(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \

	        $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \

	done

	done

@mk_cleanup@

@mk_cleanup@

(-) torque-2.0.0p2.orig/src/scheduler.cc/samples/fifo/Makefile.in (-2 / +2 lines)

Lines 110-117	Link Here

install::

install::

	@echo Installing other scheduler config files

	@echo Installing other scheduler config files

	@for f in $(SCHD_CONFIGS); do \

	@for f in $(SCHD_CONFIGS); do \

	    test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \

	    test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \

	        $(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \

	        $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \

	done

	done

@mk_cleanup@

@mk_cleanup@

(-) torque-2.0.0p2.orig/src/scheduler.cc/samples/msic_cluster/Makefile.in (-2 / +2 lines)

Lines 130-137	Link Here

install::

install::

	@echo Installing scheduler config file

	@echo Installing scheduler config file

	@for f in $(SCHD_CONFIG); do \

	@for f in $(SCHD_CONFIG); do \

	    test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \

	    test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \

	        $(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \

	        $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \

	done

	done

@mk_cleanup@

@mk_cleanup@

(-) torque-2.0.0p2.orig/src/scheduler.cc/samples/sgi_origin/Makefile.in (-4 / +4 lines)

Lines 165-175	Link Here

install:: $(TARGET)

install:: $(TARGET)

	@# a two step process is best to work around broken installs

	@# a two step process is best to work around broken installs

	$(INSTALL) -d $(libdir) && \

	$(INSTALL) -d $(DESTDIR)$(libdir) && \

	$(INSTALL) -m 644 $(TARGET) $(libdir)/$(TARGET)

	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)

	@for f in $(SCHD_CONFIGS); do \

	@for f in $(SCHD_CONFIGS); do \

		test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \

		test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \

		$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \

		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \

	done

	done

@mk_cleanup@

@mk_cleanup@

(-) torque-2.0.0p2.orig/src/scheduler.cc/samples/umn_cluster/Makefile.in (-2 / +2 lines)

Lines 120-127	Link Here

install::

install::

	@echo Installing scheduler config file

	@echo Installing scheduler config file

	@for f in $(SCHD_CONFIG); do \

	@for f in $(SCHD_CONFIG); do \

	    test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \

	    test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \

	        $(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \

	        $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \

	done

	done

qschedule:

qschedule:

(-) torque-2.0.0p2.orig/src/scheduler.tcl/Makefile.in (-2 / +2 lines)

Lines 115-122	Link Here

install: build

install: build

	@$(INSTALL) -d -m 755 $(sbindir) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \

	$(INSTALL) -m 700 $(TARGET) $(sbindir)

	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)

$(TARGET): $(OBJS)

$(TARGET): $(OBJS)

	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBRARIES)

	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBRARIES)

(-) torque-2.0.0p2.orig/src/server/Makefile.in (-2 / +2 lines)

Lines 168-175	Link Here

install: build

install: build

	$(PBS_MKDIRS) server

	$(PBS_MKDIRS) server

	$(PBS_MKDIRS) aux

	$(PBS_MKDIRS) aux

	@$(INSTALL) -d -m 755 $(sbindir) && \

	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \

	$(INSTALL) -m 700 $(TARGET) $(sbindir)

	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)

pbs_server: $(OBJS) $(PBSLIBS)

pbs_server: $(OBJS) $(PBSLIBS)

	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS)

	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS)

(-) torque-2.0.0p2.orig/src/tools/Makefile.in (-2 / +2 lines)

Lines 130-138	Link Here

build: $(TARGETS)

build: $(TARGETS)

install: build

install: build

	test -d $(bindir) || $(INSTALL) -m 755 -d $(bindir)

	test -d $(bindir) || $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)

	for f in $(TARGETS); do \

	for f in $(TARGETS); do \

		$(INSTALL) -m 755 $$f $(bindir); \

		$(INSTALL) -m 755 $$f $(DESTDIR)$(bindir); \

	done

	done

	@MAKE_POSIX_PLUS@@if test -n "$(TK_VER)"; then { cd xpbsmon && $(MAKE) install;} ; fi

	@MAKE_POSIX_PLUS@@if test -n "$(TK_VER)"; then { cd xpbsmon && $(MAKE) install;} ; fi

(-) torque-2.0.0p2.orig/src/tools/xpbsmon/Makefile.in (-13 / +13 lines)

Lines 129-161	Link Here

install: build

install: build

	test -d $(XPBSMON_LIB) || $(INSTALL) -m 755 -d $(XPBSMON_LIB)

	test -d $(DESTDIR)$(XPBSMON_LIB) || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)

	test -d $(XPBSMON_LIB)/bitmaps || \

	test -d $(DESTDIR)$(XPBSMON_LIB)/bitmaps || \

	    $(INSTALL) -m 755 -d $(XPBSMON_LIB)/bitmaps

	    $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)/bitmaps

	test -d $(XPBSMON_LIB)/help || \

	test -d $(DESTDIR)$(XPBSMON_LIB)/help || \

	    $(INSTALL) -m 755 -d $(XPBSMON_LIB)/help

	    $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)/help

	for f in $(srcdir)/bitmaps/*; do \

	for f in $(srcdir)/bitmaps/*; do \

	    test -f $$f && $(INSTALL) -m 644 $$f $(XPBSMON_LIB)/bitmaps; \

	    test -f $$f && $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB)/bitmaps; \

	done

	done

	for f in $(srcdir)/help/*.hlp; do \

	for f in $(srcdir)/help/*.hlp; do \

	    $(INSTALL) -m 644 $$f $(XPBSMON_LIB)/help; \

	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB)/help; \

	done

	done

	for f in $(srcdir)/*.tcl $(srcdir)/*.tk; do \

	for f in $(srcdir)/*.tcl $(srcdir)/*.tk; do \

	    $(INSTALL) -m 644 $$f $(XPBSMON_LIB); \

	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB); \

	done

	done

	# install xpbsmon changing the location of pbs_tclsh and libdir

	# install xpbsmon changing the location of pbs_tclsh and libdir

	$(INSTALL) -m 755 xpbsmon $(bindir)/xpbsmon

	$(INSTALL) -m 755 xpbsmon $(DESTDIR)$(bindir)/xpbsmon

	chmod 755 $(bindir)/xpbsmon 2> /dev/null

	chmod 755 $(DESTDIR)$(bindir)/xpbsmon 2> /dev/null

	$(INSTALL) -m 755 buildindex $(XPBSMON_LIB)

	$(INSTALL) -m 755 buildindex $(DESTDIR)$(XPBSMON_LIB)

	$(INSTALL) -m 644 xpbsmonrc $(XPBSMON_LIB)

	$(INSTALL) -m 644 xpbsmonrc $(DESTDIR)$(XPBSMON_LIB)

	cd $(XPBSMON_LIB) && ./buildindex $(XPBSMON_LIB) && chmod 644 tclIndex

	cd $(DESTDIR)$(XPBSMON_LIB) && ./buildindex . $(XPBSMON_LIB) && chmod 644 tclIndex

clean::

clean::

	$(RM) tclIndex; exit 0

	$(RM) tclIndex; exit 0

Attachment #78514: respect-destdir - Revised to correct tclIndex bug. for bug #115189