Index: Makefile
===================================================================
--- Makefile	(revision 12387)
+++ Makefile	(working copy)
@@ -78,7 +78,7 @@
 	if test -d CPV ; then \
 	( cd CPV ; $(MAKE) TLDEPS= all || exit 1) ; fi
 
-ph : bindir libfft libla mods libs pw 
+ph : bindir libfft libla mods libs pw lr-lib
 	( cd install ; $(MAKE) -f plugins_makefile phonon || exit 1 )
 
 neb : bindir libfft libla mods libs pw
Index: PHonon/examples/GRID_example/run_example_3
===================================================================
--- PHonon/examples/GRID_example/run_example_3	(revision 12387)
+++ PHonon/examples/GRID_example/run_example_3	(working copy)
@@ -79,8 +79,6 @@
 # how to run executables
 PW_COMMAND="$PARA_PREFIX $BIN_DIR/pw.x $PARA_POSTFIX"
 PH_COMMAND="$PARA_PREFIX $BIN_DIR/ph.x $PARA_POSTFIX"
-PW1_COMMAND="mpirun -n 4 $BIN_DIR/pw.x $PARA_POSTFIX"
-PH1_COMMAND="mpirun -n 4 $BIN_DIR/ph.x $PARA_POSTFIX"
 Q2R_COMMAND="$PARA_PREFIX $BIN_DIR/q2r.x $PARA_POSTFIX"
 MATDYN_COMMAND="$PARA_PREFIX $BIN_DIR/matdyn.x $PARA_POSTFIX"
 PLOTBAND_COMMAND="$BIN_DIR/plotband.x"
@@ -138,7 +136,7 @@
  0.25 0.25 0.75 3.0
 EOF
 $ECHO "  running the scf calculation...\c"
-$PW1_COMMAND < alas.scf.in > alas.scf.out
+$PW_COMMAND < alas.scf.in > alas.scf.out
 check_failure $?
 $ECHO " done"
 #
@@ -160,7 +158,7 @@
  /
 EOF
 $ECHO "  running the band structure calculation ...\c"
-$PH1_COMMAND < alas.ph.wfc.in > alas.ph.wfc.out
+$PH_COMMAND < alas.ph.wfc.in > alas.ph.wfc.out
 check_failure $?
 $ECHO " done"
 #
Index: PW/src/punch.f90
===================================================================
--- PW/src/punch.f90	(revision 12387)
+++ PW/src/punch.f90	(working copy)
@@ -38,9 +38,9 @@
   ! ... save here wavefunctions to file if never saved before
   !
   IF ( .NOT. twfcollect .AND. nks == 1 ) THEN
-     if(io_level < 1)  CALL diropn( iunwfc, 'wfc', 2*nwordwfc, exst )
+     IF (io_level < 1) CALL diropn( iunwfc, 'wfc', 2*nwordwfc, exst )
      CALL davcio ( evc, 2*nwordwfc, iunwfc, nks, 1 )
-     CLOSE ( UNIT=iunwfc, STATUS='keep' )
+     IF (io_level < 1) CLOSE ( UNIT=iunwfc, STATUS='keep' )
   END IF
   iunpun = 4
   !