X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=setup.py;h=ebeef96af03a658d9e44d752942b848b3cb66acd;hb=0e82725d64f17545e782c18039ced7ea898f8cad;hp=6aeda18e82860e9faf55d2ed4c4adfde6b740ba2;hpb=c92fe3a885801d89ea59b8bc03c5d62b28130e4a;p=gdcm.git

diff --git a/setup.py b/setup.py
index 6aeda18e..ebeef96a 100644
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,8 @@ for Remove in Jpeg8SourcesToRemove:
 Sources.extend(Jpeg8Sources)
 
 Jpeg12Sources = glob.glob(os.path.join(gdcmJpeg12SrcDir,"j*.c"))
-Jpeg12SourcesToRemove = ['jmemansi12.c', 'jmemname12.c', 'jmemdos12.c', 'jmemmac12.c']
+Jpeg12SourcesToRemove = ['jmemansi12.c', 'jmemname12.c', 'jmemdos12.c', 
+                         'jmemmac12.c']
 for Remove in Jpeg12SourcesToRemove:
    ### Because setup.py is a multiple pass process we need to trap
    ### the case where the files were allready wed out on a previous pass.
@@ -87,7 +88,10 @@ vtkSources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx")))
 vtkSources.extend(Jpeg8Sources)
 vtkSources.extend(Jpeg12Sources)
 vtkSources.extend(JpgSources)
-vtkSources.remove(os.path.join(gdcmvtkSrcDir,"vtkgdcmViewer.cxx"))
+try:
+	vtkSources.remove(os.path.join(gdcmvtkSrcDir,"vtkgdcmViewer.cxx"))
+except:
+	pass
 
 vtkLibraries=["vtkCommon","vtkCommonPython",
               "vtkIO","vtkIOPython",
@@ -125,9 +129,13 @@ setup(name=ThisModule,
 						],
       data_files=[(os.path.join(targetDir,gdcmTestDir),
                    glob.glob(os.path.join(gdcmTestDir,"*.acr"))),
+                  (targetDir,
+                   glob.glob(os.path.join(gdcmSrcDir,"*.py"))),
                   (os.path.join(targetDir,"Dicts"),
                    glob.glob(os.path.join(gdcmDictsDir,"*.*"))),
                   (targetDir,
                    glob.glob(os.path.join(gdcmSrcDir,"..","gdcmVersion.py"))),
+                  (os.path.join(targetDir,".."),
+                   glob.glob(os.path.join(gdcmSrcDir,"..","gdcmVersion.py"))),
                 ]
      )