Changes in doc/genMakefile.tcl [a740c66:2eb25b1] in git

File:

• doc/genMakefile.tcl (modified) (6 diffs)

doc/genMakefile.tcl

@@ -57 +57 @@
   global prefix suffix srcSuf objSuf pcmSuf
 
-  set dict [lsort [eval glob -nocomplain $args]]
+  set dict [eval glob -nocomplain $args]
 
   set dictSrcFiles {}
@@ -91 +91 @@
   global prefix suffix srcSuf objSuf
 
-  set source [lsort [eval glob -nocomplain $args]]
+  set source [eval glob -nocomplain $args]
 
   set srcObjFiles {}
@@ -127 +127 @@
   global prefix suffix srcSuf objSuf
 
-  set source [lsort [glob -nocomplain {external/tcl/*.c}]]
+  set source [glob -nocomplain {external/tcl/*.c}]
 
   set srcObjFiles {}
@@ -151 +151 @@
   global prefix suffix objSuf exeSuf
 
-  set executable [lsort [eval glob -nocomplain $args]]
+  set executable [eval glob -nocomplain $args]
 
   set exeFiles {}
@@ -229 +229 @@
 
 ifneq ($(PYTHIA8),)
-#HAS_PYTHIA8 = true
-#CXXFLAGS += -I$(PYTHIA8)/include
-#CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
-#OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl
+HAS_PYTHIA8 = true
+CXXFLAGS += -I$(PYTHIA8)/include
+OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
+else
+ifneq ($(PYTHIA8DATA),)
+HAS_PYTHIA8 = true
+CXXFLAGS += -I$(PYTHIA8DATA)/../include
+OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
+endif
 endif
 
@@ -396 +401 @@
         @echo ">> Building $(DISTTAR)"
         @mkdir -p $(DISTDIR)
-        @cp -a CHANGELOG COPYING CREDITS README VERSION Makefile configure cards classes converters display doc examples external modules python readers $(DISTDIR)
+        @cp -a CHANGELOG CREDITS README VERSION Makefile configure classes converters display doc examples external modules python readers $(DISTDIR)
         @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
         @tar -czf $(DISTTAR) $(DISTDIR)