Attachment #78451 for bug #120833

Lines 16-22 Link Here

(-)torque-2.0.0p2.orig/buildutils/mkincludes/lib.mk.in (-2 / +2 lines)
16		16
17	install:: $(TARGET)	17	install:: $(TARGET)
18	@# a two step process is best to work around broken installs	18	@# a two step process is best to work around broken installs
19	$(INSTALL) -d $(libdir) && \	19	$(INSTALL) -d $(DESTDIR)$(libdir) && \
20	$(INSTALL) -m 644 $(TARGET) $(libdir)/$(TARGET)	20	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
21		21
22	# END lib.mk	22	# END lib.mk




	# dlist will contain a list of directory names to make
	id_dlist=""

	id_dname=${DESTDIR}$id_dname
	while [ ! \( -z "$id_dname" -o "$id_dname" = / -o \
		"$id_dname" = "." \) ]; do


		echo $idv_dvarname exists and is not a directory 1>&2
		return 1
	elif [ -d $idv_dname ] ; then
		chmod $idv_mode ${DESTDIR}$idv_dname > /dev/null 2>&1
		test -n "$idv_owner" && chown $idv_owner ${DESTDIR}$idv_dname > /dev/null 2>&1
		return 0
	elif [ ! -d $idv_dname ] ; then
		test -n "$verbose" && echo Creating $idv_dname
		install_dir `dirname $idv_dname` 755 $idv_owner && \
		    mkdir ${DESTDIR}$idv_dname && chmod $idv_mode ${DESTDIR}$idv_dname || return 1
		if test -n "$idv_owner"; then
			chown $idv_owner ${DESTDIR}$idv_name || return 1
		fi
 	
	fi

check_env()
{
	test -n "$verbose" && echo Making environment file
	PBS_ENVIRON="${DESTDIR}${PBS_ENVIRON}"
	if [ ! -f $PBS_ENVIRON ] ; then
		install_dir `dirname $PBS_ENVIRON`
		echo "PATH=/bin:/usr/bin" > $PBS_ENVIRON

        #  if default already exists, leave alone 

	# solaris fails on '-e', use '-f'
	PBS_DEFAULT_FILE="${DESTDIR}${PBS_DEFAULT_FILE}"
	if [ ! -f $PBS_DEFAULT_FILE ]; then
	    rm -f $PBS_DEFAULT_FILE > /dev/null 2>&1
	    echo $PBS_DEFAULT_SERVER > $PBS_DEFAULT_FILE && \





install1:	${MAN1}
	@echo Installing section 1 man pages
	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN1) && \
	for t in $?; do \
		tt=`basename $$t B`; \
		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \
		chmod 644 $(DESTDIR)${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \
	done

install3: $(MAN3)
	@echo Installing section 3 man pages
	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN3) && \
	for t in $?; do \
		tt=`basename $$t B`; \
		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \
		chmod 644 $(DESTDIR)${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \
	done

install7: $(MAN7)
	@echo Installing section 7 man pages
	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN7) && \
	for t in $?;  do \
		tt=`basename $$t B`; \
		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \
		chmod 644 $(DESTDIR)${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \
	done
	@rm -f $(DESTDIR)${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX)
	@if test -f $(DESTDIR)${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) ;then \
		ln $(DESTDIR)${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) $(DESTDIR)${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX); \
	fi

install8: $(MAN8)
	@echo Installing section 8 man pages
	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN8) && \
	for t in $?; do \
		tt=`basename $$t B`; \
		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \
		chmod 644 $(DESTDIR)${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \
	done
	@rm -f $(DESTDIR)${PBS_MAN8}/pbs_sched.8$(MAN_SUFFIX)
	@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::





	$(PBS_MKDIRS) clients
	$(PBS_MKDIRS) aux
	$(PBS_MKDIRS) default
	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir) && \
	for f in $(USER) $(OPER) $(ADMN) $(SCRIPTS) ; do \
	    $(INSTALL) -m 755 $$f $(DESTDIR)$(bindir)/$$f ; \
	done
	for f in $(SUPP) ; do \
	    $(INSTALL) -m 755 $$f $(DESTDIR)$(sbindir)/$$f ; \
	done

#

Lines 115-123 Link Here

(-)torque-2.0.0p2.orig/src/gui/Ccode/Makefile.in (-2 / +2 lines)
115	build: $(TARGETS)	115	build: $(TARGETS)
116		116
117	install: build	117	install: build
118	-test -d $(XPBS_LIB)/bin \|\| $(INSTALL) -d $(XPBS_LIB)/bin	118	-test -d $(DESTDIR)$(XPBS_LIB)/bin \|\| $(INSTALL) -d $(DESTDIR)$(XPBS_LIB)/bin
119	for f in $(TARGETS); do \	119	for f in $(TARGETS); do \
120	$(INSTALL) -m 755 $$f $(XPBS_LIB)/bin; \	120	$(INSTALL) -m 755 $$f $(DESTDIR)$(XPBS_LIB)/bin; \
121	done	121	done
122		122
123	DFLT_ACTION = $(CC) $(CFLAGS) $@.o -o $@ $(LIBRARIES)	123	DFLT_ACTION = $(CC) $(CFLAGS) $@.o -o $@ $(LIBRARIES)




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

install: build
	test -d $(DESTDIR)$(XPBS_LIB) || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)
	test -d $(DESTDIR)$(XPBS_LIB)/bitmaps || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)/bitmaps
	test -d $(DESTDIR)$(XPBS_LIB)/help || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)/help
	#
	for f in $(srcdir)/bitmaps/*; do \
	    test -f $$f && $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB)/bitmaps; \
	done
	#
	for f in $(srcdir)/help/*.hlp; do \
	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB)/help; \
	done
	#
	@cd Ccode; $(MAKE) install
	#
	for f in $(srcdir)/*.tcl $(srcdir)/*.tk; do \
	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB); \
	done
	#
	# install xpbs changing the location of libdir and appdefdir
	#
	@echo Install xpbs
	$(INSTALL) -m 755 xpbs $(DESTDIR)$(bindir)/xpbs
	@chmod 755 $(bindir)/xpbs 2> /dev/null
	#
	$(INSTALL) -m 755 buildindex $(DESTDIR)$(XPBS_LIB)
	$(INSTALL) -m 644 xpbsrc $(DESTDIR)$(XPBS_LIB)
	#
	cd $(DESTDIR)$(XPBS_LIB) && ./buildindex $(DESTDIR)$(XPBS_LIB) && chmod 644 tclIndex


distclean clean::

Lines 110-117 Link Here

(-)torque-2.0.0p2.orig/src/iff/Makefile.in (-2 / +2 lines)
110	build: $(TARGET)	110	build: $(TARGET)
111		111
112	install: $(TARGET)	112	install: $(TARGET)
113	@$(INSTALL) -d -m 755 $(sbindir) && \	113	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
114	$(INSTALL) -m 4755 $(TARGET) $(sbindir)	114	$(INSTALL) -m 4755 $(TARGET) $(DESTDIR)$(sbindir)
115		115
116	pbs_iff: $(OBJS) $(PBS_LIBS)	116	pbs_iff: $(OBJS) $(PBS_LIBS)
117	$(CC) $(CFLAGS) -o $@ $(OBJS) $(PBS_LIBS) $(LIBS)	117	$(CC) $(CFLAGS) -o $@ $(OBJS) $(PBS_LIBS) $(LIBS)

Lines 146-154 Link Here

(-)torque-2.0.0p2.orig/src/include/Makefile.in (-2 / +2 lines)
146		146
147		147
148	install:	148	install:
149	@$(INSTALL) -d -m 755 $(includedir) && \	149	@$(INSTALL) -d -m 755 $(DESTDIR)$(includedir) && \
150	for f in $(USERH); do \	150	for f in $(USERH); do \
151	$(INSTALL) -m 444 $$f $(includedir); \	151	$(INSTALL) -m 444 $$f $(DESTDIR)$(includedir); \
152	done	152	done
153		153
154	clean::	154	clean::

Lines 111-118 Link Here

(-)torque-2.0.0p2.orig/src/mom_rcp/Makefile.in (-2 / +2 lines)
111	build: $(TARGET)	111	build: $(TARGET)
112		112
113	install: $(TARGET)	113	install: $(TARGET)
114	$(INSTALL) -d $(sbindir)	114	$(INSTALL) -d $(DESTDIR)$(sbindir)
115	$(INSTALL) -m 4755 $(TARGET) $(sbindir)	115	$(INSTALL) -m 4755 $(TARGET) $(DESTDIR)$(sbindir)
116		116
117	$(TARGET): $(OBJS)	117	$(TARGET): $(OBJS)
118	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)	118	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)

Lines 142-149 Link Here

(-)torque-2.0.0p2.orig/src/resmom/Makefile.in (-2 / +2 lines)
142	install: build	142	install: build
143	$(PBS_MKDIRS) mom	143	$(PBS_MKDIRS) mom
144	$(PBS_MKDIRS) aux	144	$(PBS_MKDIRS) aux
145	@$(INSTALL) -d -m 755 $(sbindir) && \	145	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
146	$(INSTALL) -m 700 $(TARGET) $(sbindir)	146	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)
147		147
148	pbs_mom: $(OBJS) $(PBSLIBS)	148	pbs_mom: $(OBJS) $(PBSLIBS)
149	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS) $(MOMLIBS)	149	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS) $(MOMLIBS)

Lines 124-133 Link Here

(-)torque-2.0.0p2.orig/src/scheduler.basl/Makefile.in (-4 / +4 lines)
124	build: $(TARGETS)	124	build: $(TARGETS)
125		125
126	install: build	126	install: build
127	$(INSTALL) -d -m 755 $(bindir) && \	127	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir) && \
128	$(INSTALL) -m 755 basl2c $(bindir) ; \	128	$(INSTALL) -m 755 basl2c $(DESTDIR)$(bindir) ; \
129	$(INSTALL) -d -m 755 $(sbindir) && \	129	$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
130	$(INSTALL) -m 700 pbs_sched $(sbindir)	130	$(INSTALL) -m 700 pbs_sched $(DESTDIR)$(sbindir)
131		131
132	basl2c: $(OBJS_COMMON) $(OBJS_COMP)	132	basl2c: $(OBJS_COMMON) $(OBJS_COMP)
133	$(CC) $(CFLAGS) -o $@ $(OBJS_COMMON) $(OBJS_COMP) $(LIBRARIES)	133	$(CC) $(CFLAGS) -o $@ $(OBJS_COMMON) $(OBJS_COMP) $(LIBRARIES)

Lines 123-130 Link Here

(-)torque-2.0.0p2.orig/src/scheduler.cc/Makefile.in (-2 / +2 lines)
123		123
124	install: build	124	install: build
125	@MAKE_POSIX_PLUS@@cd $(SCHD_BUILD) && $(MAKE) install	125	@MAKE_POSIX_PLUS@@cd $(SCHD_BUILD) && $(MAKE) install
126	@$(INSTALL) -d -m 755 $(sbindir) && \	126	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
127	$(INSTALL) -m 700 $(TARGET) $(sbindir)	127	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)
128		128
129	$(TARGET): $(OBJS) $(SCHEDLIB)	129	$(TARGET): $(OBJS) $(SCHEDLIB)
130	$(CC) $(CFLAGS) -o $@ $(OBJS) $(SCHEDLIB) $(PBSLIBS) $(LIBS)	130	$(CC) $(CFLAGS) -o $@ $(OBJS) $(SCHEDLIB) $(PBSLIBS) $(LIBS)

Lines 161-171 Link Here

(-)torque-2.0.0p2.orig/src/scheduler.cc/samples/cray_t3e/Makefile.in (-4 / +4 lines)
161		161
162	install:: $(TARGET)	162	install:: $(TARGET)
163	@# a two step process is best to work around broken installs	163	@# a two step process is best to work around broken installs
164	$(INSTALL) -d $(libdir) && \	164	$(INSTALL) -d $(DESTDIR)$(libdir) && \
165	$(INSTALL) -m 644 $(TARGET) $(libdir)/$(TARGET)	165	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
166	@for f in $(SCHD_CONFIGS); do \	166	@for f in $(SCHD_CONFIGS); do \
167	test -f $(PBS_SERVER_HOME)/sched_priv/$$f \|\| \	167	test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f \|\| \
168	$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \	168	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
169	done	169	done
170		170
171	@mk_cleanup@	171	@mk_cleanup@

Lines 109-116 Link Here

(-)torque-2.0.0p2.orig/src/scheduler.cc/samples/dec_cluster/Makefile.in (-2 / +2 lines)
109	install::	109	install::
110	@echo Installing scheduler config file	110	@echo Installing scheduler config file
111	@for f in $(SCHD_CONFIG); do \	111	@for f in $(SCHD_CONFIG); do \
112	test -f $(PBS_SERVER_HOME)/sched_priv/$$f \|\| \	112	test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f \|\| \
113	$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \	113	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
114	done	114	done
115		115
116	@mk_cleanup@	116	@mk_cleanup@

Lines 110-117 Link Here

(-)torque-2.0.0p2.orig/src/scheduler.cc/samples/fifo/Makefile.in (-2 / +2 lines)
110	install::	110	install::
111	@echo Installing other scheduler config files	111	@echo Installing other scheduler config files
112	@for f in $(SCHD_CONFIGS); do \	112	@for f in $(SCHD_CONFIGS); do \
113	test -f $(PBS_SERVER_HOME)/sched_priv/$$f \|\| \	113	test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f \|\| \
114	$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \	114	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
115	done	115	done
116		116
117	@mk_cleanup@	117	@mk_cleanup@

Lines 130-137 Link Here

(-)torque-2.0.0p2.orig/src/scheduler.cc/samples/msic_cluster/Makefile.in (-2 / +2 lines)
130	install::	130	install::
131	@echo Installing scheduler config file	131	@echo Installing scheduler config file
132	@for f in $(SCHD_CONFIG); do \	132	@for f in $(SCHD_CONFIG); do \
133	test -f $(PBS_SERVER_HOME)/sched_priv/$$f \|\| \	133	test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f \|\| \
134	$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \	134	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
135	done	135	done
136		136
137	@mk_cleanup@	137	@mk_cleanup@

Lines 165-175 Link Here

(-)torque-2.0.0p2.orig/src/scheduler.cc/samples/sgi_origin/Makefile.in (-4 / +4 lines)
165		165
166	install:: $(TARGET)	166	install:: $(TARGET)
167	@# a two step process is best to work around broken installs	167	@# a two step process is best to work around broken installs
168	$(INSTALL) -d $(libdir) && \	168	$(INSTALL) -d $(DESTDIR)$(libdir) && \
169	$(INSTALL) -m 644 $(TARGET) $(libdir)/$(TARGET)	169	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
170	@for f in $(SCHD_CONFIGS); do \	170	@for f in $(SCHD_CONFIGS); do \
171	test -f $(PBS_SERVER_HOME)/sched_priv/$$f \|\| \	171	test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f \|\| \
172	$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \	172	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
173	done	173	done
174		174
175	@mk_cleanup@	175	@mk_cleanup@

Lines 120-127 Link Here

(-)torque-2.0.0p2.orig/src/scheduler.cc/samples/umn_cluster/Makefile.in (-2 / +2 lines)
120	install::	120	install::
121	@echo Installing scheduler config file	121	@echo Installing scheduler config file
122	@for f in $(SCHD_CONFIG); do \	122	@for f in $(SCHD_CONFIG); do \
123	test -f $(PBS_SERVER_HOME)/sched_priv/$$f \|\| \	123	test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f \|\| \
124	$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \	124	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
125	done	125	done
126		126
127	qschedule:	127	qschedule:

Lines 115-122 Link Here

(-)torque-2.0.0p2.orig/src/scheduler.tcl/Makefile.in (-2 / +2 lines)
115		115
116		116
117	install: build	117	install: build
118	@$(INSTALL) -d -m 755 $(sbindir) && \	118	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
119	$(INSTALL) -m 700 $(TARGET) $(sbindir)	119	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)
120		120
121	$(TARGET): $(OBJS)	121	$(TARGET): $(OBJS)
122	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBRARIES)	122	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBRARIES)

Lines 168-175 Link Here

(-)torque-2.0.0p2.orig/src/server/Makefile.in (-2 / +2 lines)
168	install: build	168	install: build
169	$(PBS_MKDIRS) server	169	$(PBS_MKDIRS) server
170	$(PBS_MKDIRS) aux	170	$(PBS_MKDIRS) aux
171	@$(INSTALL) -d -m 755 $(sbindir) && \	171	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
172	$(INSTALL) -m 700 $(TARGET) $(sbindir)	172	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)
173		173
174	pbs_server: $(OBJS) $(PBSLIBS)	174	pbs_server: $(OBJS) $(PBSLIBS)
175	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS)	175	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS)

Lines 130-138 Link Here

(-)torque-2.0.0p2.orig/src/tools/Makefile.in (-2 / +2 lines)
130	build: $(TARGETS)	130	build: $(TARGETS)
131		131
132	install: build	132	install: build
133	test -d $(bindir) \|\| $(INSTALL) -m 755 -d $(bindir)	133	test -d $(bindir) \|\| $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
134	for f in $(TARGETS); do \	134	for f in $(TARGETS); do \
135	$(INSTALL) -m 755 $$f $(bindir); \	135	$(INSTALL) -m 755 $$f $(DESTDIR)$(bindir); \
136	done	136	done
137	@MAKE_POSIX_PLUS@@if test -n "$(TK_VER)"; then { cd xpbsmon && $(MAKE) install;} ; fi	137	@MAKE_POSIX_PLUS@@if test -n "$(TK_VER)"; then { cd xpbsmon && $(MAKE) install;} ; fi
138		138






install: build
	test -d $(DESTDIR)$(XPBSMON_LIB) || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)
	test -d $(DESTDIR)$(XPBSMON_LIB)/bitmaps || \
	    $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)/bitmaps
	test -d $(DESTDIR)$(XPBSMON_LIB)/help || \
	    $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)/help
	#
	for f in $(srcdir)/bitmaps/*; do \
	    test -f $$f && $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB)/bitmaps; \
	done
	#
	for f in $(srcdir)/help/*.hlp; do \
	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB)/help; \
	done
	#
	for f in $(srcdir)/*.tcl $(srcdir)/*.tk; do \
	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB); \
	done
	#
	# install xpbsmon changing the location of pbs_tclsh and libdir
	#
	$(INSTALL) -m 755 xpbsmon $(DESTDIR)$(bindir)/xpbsmon
	chmod 755 $(DESTDIR)$(bindir)/xpbsmon 2> /dev/null
	#
	$(INSTALL) -m 755 buildindex $(DESTDIR)$(XPBSMON_LIB)
	$(INSTALL) -m 644 xpbsmonrc $(DESTDIR)$(XPBSMON_LIB)
	#
	cd $(DESTDIR)$(XPBSMON_LIB) && ./buildindex $(DESTDIR)$(XPBSMON_LIB) && chmod 644 tclIndex

clean::
	$(RM) tclIndex; exit 0

Return to bug 120833

Lines 140-145 Link Here

(-)torque-2.0.0p2.orig/buildutils/pbs_mkdirs.in (-4 / +7 lines)
140	# dlist will contain a list of directory names to make	140	# dlist will contain a list of directory names to make
141	id_dlist=""	141	id_dlist=""
142		142
		143	id_dname=${DESTDIR}$id_dname
143	while [ ! \( -z "$id_dname" -o "$id_dname" = / -o \	144	while [ ! \( -z "$id_dname" -o "$id_dname" = / -o \
144	"$id_dname" = "." \) ]; do	145	"$id_dname" = "." \) ]; do
145		146
Lines 188-202 Link Here
188	echo $idv_dvarname exists and is not a directory 1>&2	189	echo $idv_dvarname exists and is not a directory 1>&2
189	return 1	190	return 1
190	elif [ -d $idv_dname ] ; then	191	elif [ -d $idv_dname ] ; then
191	chmod $idv_mode $idv_dname	192	chmod $idv_mode ${DESTDIR}$idv_dname > /dev/null 2>&1
192	test -n "$idv_owner" && chown $idv_owner $idv_dname	193	test -n "$idv_owner" && chown $idv_owner ${DESTDIR}$idv_dname > /dev/null 2>&1
193	return 0	194	return 0
194	elif [ ! -d $idv_dname ] ; then	195	elif [ ! -d $idv_dname ] ; then
195	test -n "$verbose" && echo Creating $idv_dname	196	test -n "$verbose" && echo Creating $idv_dname
196	install_dir `dirname $idv_dname` 755 $idv_owner && \	197	install_dir `dirname $idv_dname` 755 $idv_owner && \
197	mkdir $idv_dname && chmod $idv_mode $idv_dname \|\| return 1	198	mkdir ${DESTDIR}$idv_dname && chmod $idv_mode ${DESTDIR}$idv_dname \|\| return 1
198	if test -n "$idv_owner"; then	199	if test -n "$idv_owner"; then
199	chown $idv_owner $idv_name \|\| return 1	200	chown $idv_owner ${DESTDIR}$idv_name \|\| return 1
200	fi	201	fi
201		202
202	fi	203	fi
Lines 207-212 Link Here
207	check_env()	208	check_env()
208	{	209	{
209	test -n "$verbose" && echo Making environment file	210	test -n "$verbose" && echo Making environment file
		211	PBS_ENVIRON="${DESTDIR}${PBS_ENVIRON}"
210	if [ ! -f $PBS_ENVIRON ] ; then	212	if [ ! -f $PBS_ENVIRON ] ; then
211	install_dir `dirname $PBS_ENVIRON`	213	install_dir `dirname $PBS_ENVIRON`
212	echo "PATH=/bin:/usr/bin" > $PBS_ENVIRON	214	echo "PATH=/bin:/usr/bin" > $PBS_ENVIRON
Lines 324-329 Link Here
324	# if default already exists, leave alone	326	# if default already exists, leave alone
325		327
326	# solaris fails on '-e', use '-f'	328	# solaris fails on '-e', use '-f'
		329	PBS_DEFAULT_FILE="${DESTDIR}${PBS_DEFAULT_FILE}"
327	if [ ! -f $PBS_DEFAULT_FILE ]; then	330	if [ ! -f $PBS_DEFAULT_FILE ]; then
328	rm -f $PBS_DEFAULT_FILE > /dev/null 2>&1	331	rm -f $PBS_DEFAULT_FILE > /dev/null 2>&1
329	echo $PBS_DEFAULT_SERVER > $PBS_DEFAULT_FILE && \	332	echo $PBS_DEFAULT_SERVER > $PBS_DEFAULT_FILE && \

Lines 196-244 Link Here

(-)torque-2.0.0p2.orig/doc/Makefile.in (-21 / +21 lines)
196		196
197	install1: ${MAN1}	197	install1: ${MAN1}
198	@echo Installing section 1 man pages	198	@echo Installing section 1 man pages
199	@$(INSTALL) -d -m 755 $(PBS_MAN) && \	199	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
200	$(INSTALL) -d -m 755 $(PBS_MAN1) && \	200	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN1) && \
201	for t in $?; do \	201	for t in $?; do \
202	tt=`basename $$t B`; \	202	tt=`basename $$t B`; \
203	${SOELIM} -d $(DOCSRC)/ers $$t \| sed -e 's/^\.Sh/.SH/' >${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \	203	${SOELIM} -d $(DOCSRC)/ers $$t \| sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \
204	chmod 644 ${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \	204	chmod 644 $(DESTDIR)${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \
205	done	205	done
206		206
207	install3: $(MAN3)	207	install3: $(MAN3)
208	@echo Installing section 3 man pages	208	@echo Installing section 3 man pages
209	@$(INSTALL) -d -m 755 $(PBS_MAN) && \	209	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
210	$(INSTALL) -d -m 755 $(PBS_MAN3) && \	210	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN3) && \
211	for t in $?; do \	211	for t in $?; do \
212	tt=`basename $$t B`; \	212	tt=`basename $$t B`; \
213	${SOELIM} -d $(DOCSRC)/ers $$t \| sed -e 's/^\.Sh/.SH/' >${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \	213	${SOELIM} -d $(DOCSRC)/ers $$t \| sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \
214	chmod 644 ${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \	214	chmod 644 $(DESTDIR)${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \
215	done	215	done
216		216
217	install7: $(MAN7)	217	install7: $(MAN7)
218	@echo Installing section 7 man pages	218	@echo Installing section 7 man pages
219	@$(INSTALL) -d -m 755 $(PBS_MAN) && \	219	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
220	$(INSTALL) -d -m 755 $(PBS_MAN7) && \	220	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN7) && \
221	for t in $?; do \	221	for t in $?; do \
222	tt=`basename $$t B`; \	222	tt=`basename $$t B`; \
223	${SOELIM} -d $(DOCSRC)/ers $$t \| sed -e 's/^\.Sh/.SH/' >${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \	223	${SOELIM} -d $(DOCSRC)/ers $$t \| sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \
224	chmod 644 ${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \	224	chmod 644 $(DESTDIR)${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \
225	done	225	done
226	@rm -f ${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX)	226	@rm -f $(DESTDIR)${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX)
227	@if test -f ${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) ;then \	227	@if test -f $(DESTDIR)${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) ;then \
228	ln ${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) ${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX); \	228	ln $(DESTDIR)${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) $(DESTDIR)${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX); \
229	fi	229	fi
230		230
231	install8: $(MAN8)	231	install8: $(MAN8)
232	@echo Installing section 8 man pages	232	@echo Installing section 8 man pages
233	@$(INSTALL) -d -m 755 $(PBS_MAN) && \	233	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
234	$(INSTALL) -d -m 755 $(PBS_MAN8) && \	234	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN8) && \
235	for t in $?; do \	235	for t in $?; do \
236	tt=`basename $$t B`; \	236	tt=`basename $$t B`; \
237	${SOELIM} -d $(DOCSRC)/ers $$t \| sed -e 's/^\.Sh/.SH/' >${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \	237	${SOELIM} -d $(DOCSRC)/ers $$t \| sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \
238	chmod 644 ${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \	238	chmod 644 $(DESTDIR)${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \
239	done	239	done
240	@rm -f ${PBS_MAN8}/pbs_sched.8$(MAN_SUFFIX)	240	@rm -f $(DESTDIR)${PBS_MAN8}/pbs_sched.8$(MAN_SUFFIX)
241	@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	241	@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
242		242
243	depend::	243	depend::
244		244

Lines 135-146 Link Here

(-)torque-2.0.0p2.orig/src/cmds/Makefile.in (-3 / +3 lines)
135	$(PBS_MKDIRS) clients	135	$(PBS_MKDIRS) clients
136	$(PBS_MKDIRS) aux	136	$(PBS_MKDIRS) aux
137	$(PBS_MKDIRS) default	137	$(PBS_MKDIRS) default
138	$(INSTALL) -d -m 755 $(bindir) && \	138	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir) && \
139	for f in $(USER) $(OPER) $(ADMN) $(SCRIPTS) ; do \	139	for f in $(USER) $(OPER) $(ADMN) $(SCRIPTS) ; do \
140	$(INSTALL) -m 755 $$f $(bindir)/$$f ; \	140	$(INSTALL) -m 755 $$f $(DESTDIR)$(bindir)/$$f ; \
141	done	141	done
142	for f in $(SUPP) ; do \	142	for f in $(SUPP) ; do \
143	$(INSTALL) -m 755 $$f $(sbindir)/$$f ; \	143	$(INSTALL) -m 755 $$f $(DESTDIR)$(sbindir)/$$f ; \
144	done	144	done
145		145
146	#	146	#

Lines 133-166 Link Here

(-)torque-2.0.0p2.orig/src/gui/Makefile.in (-10 / +10 lines)
133	@MAKE_POSIX_PLUS@@echo Making in Ccode for xpbs; cd Ccode; $(MAKE) all	133	@MAKE_POSIX_PLUS@@echo Making in Ccode for xpbs; cd Ccode; $(MAKE) all
134		134
135	install: build	135	install: build
136	test -d $(XPBS_LIB) \|\| $(INSTALL) -m 755 -d $(XPBS_LIB)	136	test -d $(DESTDIR)$(XPBS_LIB) \|\| $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)
137	test -d $(XPBS_LIB)/bitmaps \|\| $(INSTALL) -m 755 -d $(XPBS_LIB)/bitmaps	137	test -d $(DESTDIR)$(XPBS_LIB)/bitmaps \|\| $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)/bitmaps
138	test -d $(XPBS_LIB)/help \|\| $(INSTALL) -m 755 -d $(XPBS_LIB)/help	138	test -d $(DESTDIR)$(XPBS_LIB)/help \|\| $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)/help
139	#	139	#
140	for f in $(srcdir)/bitmaps/*; do \	140	for f in $(srcdir)/bitmaps/*; do \
141	test -f $$f && $(INSTALL) -m 644 $$f $(XPBS_LIB)/bitmaps; \	141	test -f $$f && $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB)/bitmaps; \
142	done	142	done
143	#	143	#
144	for f in $(srcdir)/help/*.hlp; do \	144	for f in $(srcdir)/help/*.hlp; do \
145	$(INSTALL) -m 644 $$f $(XPBS_LIB)/help; \	145	$(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB)/help; \
146	done	146	done
147	#	147	#
148	@cd Ccode; $(MAKE) install	148	@cd Ccode; $(MAKE) install
149	#	149	#
150	for f in $(srcdir)/.tcl $(srcdir)/.tk; do \	150	for f in $(srcdir)/.tcl $(srcdir)/.tk; do \
151	$(INSTALL) -m 644 $$f $(XPBS_LIB); \	151	$(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB); \
152	done	152	done
153	#	153	#
154	# install xpbs changing the location of libdir and appdefdir	154	# install xpbs changing the location of libdir and appdefdir
155	#	155	#
156	@echo Install xpbs	156	@echo Install xpbs
157	$(INSTALL) -m 755 xpbs $(bindir)/xpbs	157	$(INSTALL) -m 755 xpbs $(DESTDIR)$(bindir)/xpbs
158	@chmod 755 $(bindir)/xpbs 2> /dev/null	158	@chmod 755 $(bindir)/xpbs 2> /dev/null
159	#	159	#
160	$(INSTALL) -m 755 buildindex $(XPBS_LIB)	160	$(INSTALL) -m 755 buildindex $(DESTDIR)$(XPBS_LIB)
161	$(INSTALL) -m 644 xpbsrc $(XPBS_LIB)	161	$(INSTALL) -m 644 xpbsrc $(DESTDIR)$(XPBS_LIB)
162	#	162	#
163	cd $(XPBS_LIB) && ./buildindex $(XPBS_LIB) && chmod 644 tclIndex	163	cd $(DESTDIR)$(XPBS_LIB) && ./buildindex $(DESTDIR)$(XPBS_LIB) && chmod 644 tclIndex
164		164
165		165
166	distclean clean::	166	distclean clean::

Lines 129-161 Link Here

(-)torque-2.0.0p2.orig/src/tools/xpbsmon/Makefile.in (-13 / +13 lines)
129		129
130		130
131	install: build	131	install: build
132	test -d $(XPBSMON_LIB) \|\| $(INSTALL) -m 755 -d $(XPBSMON_LIB)	132	test -d $(DESTDIR)$(XPBSMON_LIB) \|\| $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)
133	test -d $(XPBSMON_LIB)/bitmaps \|\| \	133	test -d $(DESTDIR)$(XPBSMON_LIB)/bitmaps \|\| \
134	$(INSTALL) -m 755 -d $(XPBSMON_LIB)/bitmaps	134	$(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)/bitmaps
135	test -d $(XPBSMON_LIB)/help \|\| \	135	test -d $(DESTDIR)$(XPBSMON_LIB)/help \|\| \
136	$(INSTALL) -m 755 -d $(XPBSMON_LIB)/help	136	$(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)/help
137	#	137	#
138	for f in $(srcdir)/bitmaps/*; do \	138	for f in $(srcdir)/bitmaps/*; do \
139	test -f $$f && $(INSTALL) -m 644 $$f $(XPBSMON_LIB)/bitmaps; \	139	test -f $$f && $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB)/bitmaps; \
140	done	140	done
141	#	141	#
142	for f in $(srcdir)/help/*.hlp; do \	142	for f in $(srcdir)/help/*.hlp; do \
143	$(INSTALL) -m 644 $$f $(XPBSMON_LIB)/help; \	143	$(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB)/help; \
144	done	144	done
145	#	145	#
146	for f in $(srcdir)/.tcl $(srcdir)/.tk; do \	146	for f in $(srcdir)/.tcl $(srcdir)/.tk; do \
147	$(INSTALL) -m 644 $$f $(XPBSMON_LIB); \	147	$(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB); \
148	done	148	done
149	#	149	#
150	# install xpbsmon changing the location of pbs_tclsh and libdir	150	# install xpbsmon changing the location of pbs_tclsh and libdir
151	#	151	#
152	$(INSTALL) -m 755 xpbsmon $(bindir)/xpbsmon	152	$(INSTALL) -m 755 xpbsmon $(DESTDIR)$(bindir)/xpbsmon
153	chmod 755 $(bindir)/xpbsmon 2> /dev/null	153	chmod 755 $(DESTDIR)$(bindir)/xpbsmon 2> /dev/null
154	#	154	#
155	$(INSTALL) -m 755 buildindex $(XPBSMON_LIB)	155	$(INSTALL) -m 755 buildindex $(DESTDIR)$(XPBSMON_LIB)
156	$(INSTALL) -m 644 xpbsmonrc $(XPBSMON_LIB)	156	$(INSTALL) -m 644 xpbsmonrc $(DESTDIR)$(XPBSMON_LIB)
157	#	157	#
158	cd $(XPBSMON_LIB) && ./buildindex $(XPBSMON_LIB) && chmod 644 tclIndex	158	cd $(DESTDIR)$(XPBSMON_LIB) && ./buildindex $(DESTDIR)$(XPBSMON_LIB) && chmod 644 tclIndex
159		159
160	clean::	160	clean::
161	$(RM) tclIndex; exit 0	161	$(RM) tclIndex; exit 0