Synch PLIST with reality to fix problems seen in Huberts latest bulk-build.

1 files changed, 107 insertions, 269 deletions

diff --git a/sysutils/gworkspace/PLIST b/sysutils/gworkspace/PLIST
index cef4cc02d1f..0600a999148 100644
--- a/sysutils/gworkspace/PLIST
+++ b/sysutils/gworkspace/PLIST
@@ -1,29 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/28 02:19:53 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/13 15:23:11 jschauma Exp $
 share/GNUstep/System/Applications/GWorkspace.app/GWorkspace
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Contents/Resources/InspectorInfo.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/AppViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Resources/miniwindow.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Resources/preview.tiff
+share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/AppViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS/Root
 share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/miniwindow.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/preview.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/BrowserViewer
+share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/BrowserViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/CVS/Root
@@ -53,14 +39,9 @@ share/GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Op
 share/GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small_alt.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_alt.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/FileManager.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Contents/Resources/InspectorInfo.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/FolderViewer
+share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/FolderViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/CVS/Root
@@ -70,39 +51,20 @@ share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/CVS/Entr
 share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/CVS/Root
 share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Resources/miniwindow.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Resources/preview.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/CVS/Root
 share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/miniwindow.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/preview.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/IconsViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Contents/Resources/InspectorInfo.plist
+share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/IconsViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/ImageViewer
+share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/ImageViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Contents/Resources/InspectorInfo.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/InspectorViewer
+share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/InspectorViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS/Root
@@ -139,25 +101,10 @@ share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-8.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-9.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Month.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/MultipleSelection.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/left.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/page.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/papersizes.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/pause.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/play.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/right.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/stop.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/CVS/Root
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/InspectorInfo.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/left.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/page.tiff
@@ -166,15 +113,10 @@ share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/R
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/play.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/right.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/stop.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/PdfViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Contents/Resources/InspectorInfo.plist
+share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/PdfViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/PlistViewer
+share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/PlistViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS/Root
@@ -187,64 +129,34 @@ share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/CVS/En
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/CVS/Root
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Contents/Resources/InspectorInfo.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/RtfViewer
+share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/RtfViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SlideMask.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallCellHighlight.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Resources/miniwindow.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Resources/preview.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS/Root
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/miniwindow.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/preview.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/SmallIconsViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/pause.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/play.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/stop.tiff
+share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/SmallIconsViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS/Root
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/InspectorInfo.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/pause.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/play.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/stop.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/SoundViewer
+share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/SoundViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS/Entries
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS/Repository
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS/Root
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Contents/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Contents/Resources/Info.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Contents/Resources/InspectorInfo.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/StringsViewer
+share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/StringsViewer
 share/GNUstep/System/Applications/GWorkspace.app/Resources/TileHighlight.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-0.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-1.tiff
@@ -261,59 +173,38 @@ share/GNUstep/System/Applications/GWorkspace.app/Resources/stop.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/switchMultiple.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/switchOff.tiff
 share/GNUstep/System/Applications/GWorkspace.app/Resources/switchOn.tiff
-share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/GWorkspace
-share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/library_paths.openapp
-share/GNUstep/System/Library/Bundles/AppViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/AppViewer.inspector/Contents/Resources
+share/GNUstep/System/Applications/GWorkspace.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/GWorkspace
+share/GNUstep/System/Applications/GWorkspace.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/library_paths.openapp
 share/GNUstep/System/Library/Bundles/AppViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/AppViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/AppViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/AppViewer
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Contents/Resources
+share/GNUstep/System/Library/Bundles/AppViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/AppViewer
 share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/CVS/Entries
 share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/CVS/Repository
 share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/CVS/Root
 share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/miniwindow.tiff
 share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/preview.tiff
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/BrowserViewer
-share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Contents/Resources
+share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/BrowserViewer
 share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/FolderViewer
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Contents/Resources
+share/GNUstep/System/Library/Bundles/FolderViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/FolderViewer
 share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/CVS/Entries
 share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/CVS/Repository
 share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/CVS/Root
 share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/miniwindow.tiff
 share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/preview.tiff
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/IconsViewer
-share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Contents/Resources
+share/GNUstep/System/Library/Bundles/IconsViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/IconsViewer
 share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/ImageViewer
-share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Contents/Resources
+share/GNUstep/System/Library/Bundles/ImageViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/ImageViewer
 share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/InspectorViewer
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Contents/Resources
+share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/InspectorViewer
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/CVS/Entries
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/CVS/Repository
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/CVS/Root
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/InspectorInfo.plist
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/left.tiff
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/page.tiff
@@ -322,237 +213,184 @@ share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/pause.tiff
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/play.tiff
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/right.tiff
 share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/stop.tiff
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/PdfViewer
-share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Contents/Resources
+share/GNUstep/System/Library/Bundles/PdfViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/PdfViewer
 share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/PlistViewer
-share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Contents/Resources
+share/GNUstep/System/Library/Bundles/PlistViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/PlistViewer
 share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/RtfViewer
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Contents/Resources
+share/GNUstep/System/Library/Bundles/RtfViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/RtfViewer
 share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS/Entries
 share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS/Repository
 share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS/Root
 share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/miniwindow.tiff
 share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/preview.tiff
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/SmallIconsViewer
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Contents/Resources
+share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/SmallIconsViewer
 share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/CVS/Entries
 share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/CVS/Repository
 share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/CVS/Root
 share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/InspectorInfo.plist
 share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/pause.tiff
 share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/play.tiff
 share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/stop.tiff
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/SoundViewer
-share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Contents/Info.plist
-share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Contents/Resources
+share/GNUstep/System/Library/Bundles/SoundViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/SoundViewer
 share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Resources/Info.plist
 share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/StringsViewer
-share/GNUstep/System/Tools/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/backgrounder
-share/GNUstep/System/Tools/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/wopen
-@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/${GNUSTEP_HOST_CPU}
+share/GNUstep/System/Library/Bundles/StringsViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/StringsViewer
+share/GNUstep/System/Tools/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/backgrounder
+share/GNUstep/System/Tools/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu/wopen
+@dirrm share/GNUstep/System/Tools/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/ix86
 @dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Contents
 @dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/ix86
 @dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/CVS
 @dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Contents
 @dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/ix86
 @dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS
 @dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Contents
 @dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer
-@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/ix86
 @dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Contents
 @dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/ix86
 @dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Contents
 @dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/ix86
 @dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/CVS
 @dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Contents
 @dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/ix86
 @dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Contents
 @dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/ix86
 @dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Contents
 @dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/ix86
 @dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/CVS
 @dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Contents
 @dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer
-@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/ix86
 @dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Contents
 @dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/ix86
 @dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/CVS
 @dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Contents
 @dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer
-@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/ix86
 @dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/Contents
 @dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Library/Bundles
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/ix86
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/${GNUSTEP_HOST_CPU}
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/ix86/${LOWER_OPSYS}elf/gnu-gnu-gnu
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/ix86/${LOWER_OPSYS}elf
+@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/ix86
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Contents/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Contents
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector
 @dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources
 @dirrm share/GNUstep/System/Applications/GWorkspace.app
+@dirrm share/GNUstep/System/Applications