o remove debugging hacks for srun.wrapper.c -- use /usr/lib/rpm/debugedit

   if available at install time.

NEWS

@@ -8,6 +8,8 @@ documents those changes that are of interest to users and admins.
  -- Fix sinfo -R, --list-reasons to list all relevant node states.
  -- Fix slurmctld to honor srun's node configuration specifications 
     with FastSchedule==0 configuration.
+ -- Removed debugging hacks for srun.wrapper.c. Temporarily use 
+    RPM's debugedit utility if available for similar effect.
 
 * Changes in SLURM 0.3.2
 ========================

src/srun/Makefile.am

@@ -29,52 +29,29 @@ srun_SOURCES = \
 	allocate.c  \
 	allocate.h  \
 	core-format.c \
-	core-format.h
+	core-format.h \
+	srun.wrapper.c
 
 convenience_libs =  \
 	$(top_builddir)/src/common/libcommon.la   \
 	$(top_builddir)/src/common/libeio.la      \
 	$(top_builddir)/src/api/libslurm.la
 
-SRUN_WRAPPER_OBJ = \
-	srun.wrapper.o
-
 srun_LDADD = \
-	$(SRUN_WRAPPER_OBJ) \
-	$(convenience_libs)
+	$(convenience_libs) 
 
 srun_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
 
-EXTRA_srun_SOURCES = srun.wrapper.c
-srun_DEPENDENCIES = $(SRUN_WRAPPER_OBJ)
-
 force:
 $(convenience_libs) : force
 	@cd `dirname $@` && $(MAKE) `basename $@`
 
-srun.wrapper.o: srun.wrapper.c
-	if echo $(CC) | grep gcc; then \
-          destdir=$(pkglibdir)/src;    \
-          cdir=`cd $(top_srcdir)/src/srun && pwd`; \
-          src=$$cdir/srun.wrapper.c;   \
-          cp $$src .; \
-          $(CC) -S -g $(CFLAGS) $(CPPFLAGS) $$src; \
-	  perl -i -ple "s|$$cdir|$$destdir|g;" srun.wrapper.s; \
-          $(COMPILE) -c srun.wrapper.s; \
-	else \
-	  $(COMPILE) -c $(top_srcdir)/src/srun/srun.wrapper.c; \
-	fi
-
-
-CLEANFILES = \
-	srun.wrapper.s
-
-DISTCLEANFILES = \
-	srun.wrapper.c
-
 install-exec-local:
-	if test -n "$(SRUN_WRAPPER_OBJ)"; then \
-	  umask 022; \
-	  $(INSTALL) -D -m 644 $(top_srcdir)/src/srun/srun.wrapper.c \
-	                       $(DESTDIR)$(pkglibdir)/src/srun.wrapper.c; \
-	fi
+	umask 022; \
+	if [ -x /usr/lib/rpm/debugedit ]; then \
+	  srcdir=`cd $(srcdir) && pwd`; \
+	  /usr/lib/rpm/debugedit -b $$srcdir -d $(pkglibdir)/src \
+	                         $(DESTDIR)$(bindir)/srun; fi; \
+	$(INSTALL) -D -m 644 $(top_srcdir)/src/srun/srun.wrapper.c \
+	                       $(DESTDIR)$(pkglibdir)/src/srun.wrapper.c
+