--- omniorb-dfsg-4.1.3.orig/mk/beforeauto.mk.in
+++ omniorb-dfsg-4.1.3/mk/beforeauto.mk.in
@@ -675,17 +675,16 @@
 CC              = @CC@
 CXX             = @CXX@
 RANLIB		= @RANLIB@
-MKDIRHIER	= $(BASE_OMNI_TREE)/bin/scripts/omkdirhier
+MKDIRHIER	= mkdir -p
 INSTLIBFLAGS	= -m 0644
 INSTEXEFLAGS	= -m 0755
 CP		= cp
 MV		= mv -f
 CPP		= @CPP@
-OMKDEPEND	= $(TOOLBINDIR)/omkdepend
 RMDIRHIER	= $(RM) -rf
 
-CXXMAKEDEPEND   = $(OMKDEPEND) -D__cplusplus
-CMAKEDEPEND     = $(OMKDEPEND)
+CXXMAKEDEPEND   = @CXX@ -M -MD -MG
+CMAKEDEPEND     = @CC@ -M -MD -MG
 
 
 #
@@ -723,10 +722,10 @@
 #
 # Default compiler rules
 #
-CDEBUGFLAGS     = -O
+CDEBUGFLAGS     = -g
 CLINK           = $(CC)
 CLINKOPTIONS    = $(CDEBUGFLAGS) $(COPTIONS)
-CXXDEBUGFLAGS   = -O2
+CXXDEBUGFLAGS   = -g
 CXXLINK         = $(CXX)
 CXXLINKOPTIONS  = $(CXXDEBUGFLAGS) $(CXXOPTIONS)
 
@@ -737,8 +736,6 @@
 #
 
 ifdef Compiler_GCC
-CMAKEDEPEND     += -D__GNUC__
-CXXMAKEDEPEND   += -D__GNUG__ -D__GNUC__
 CXXOPTIONS       = -Wall -Wno-unused -fexceptions @EXTRA_GCC_CXXFLAGS@
 EgcsMajorVersion = 1
 EgcsMinorVersion = 1
@@ -949,7 +946,7 @@
 
 ###################
 ifdef AIX
-ifndef Compiler_GCC		# Assuming XlC compiler
+ifndef Compiler_GCC
 
 IMPORT_CPPFLAGS += -D__aix__
 
@@ -974,48 +971,7 @@
 SharedLibraryPlatformLinkFlagsTemplate = -G -qmkshrobj \
                -bnoipath -blibpath:/usr/lib:$(prefix)/lib
 
-endif
-
-ifdef Compiler_GCC
-# A lot of this is stolen from the mk/platform/powerpc_aix4.3_gcc
-# platform file, some of it is made up.  This is tested on AIX 5.3
-# with gcc 4.2.0 (as included in the AIX Toolbox for Linux
-# Applications 4/2008 (they really mean GNU applications!)).
-
-IMPORT_CPPFLAGS += -D__aix__
-CMAKEDEPEND     += -D_AIX
-CXXMAKEDEPEND   += -D_AIX
-CXXLINKOPTIONS  += -Wl,-brtl -Wl,-blibpath:/lib:/usr/lib:$(prefix)/lib
-CLINKOPTIONS    += -Wl,-brtl -Wl,-blibpath:/lib:/usr/lib:$(prefix)/lib
-
-# Name all static libraries with -ar.a suffix.
-LibPattern = lib%-ar.a
-LibDebugPattern = lib%-ar.a
-LibNoDebugPattern = lib%-ar.a
-LibSuffixPattern = %-ar.a
-LibSearchPattern = -l%-ar
-
-# Name all shared libraries with .a suffix
-LibSharedPattern = lib%.a
-LibSharedSuffixPattern = %.a
-LibSharedSearchPattern = -l%
-
-# OMNI thread stuff
-ThreadSystem = Posix
-OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=10
-OMNITHREAD_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
-OMNITHREAD_PLATFORM_LIB = -lpthreads
-OMNITHREAD_LIB = -lomnithread$(OMNITHREAD_MAJOR_VERSION)$(OMNITHREAD_MINOR_VERSION) $(OMNITHREAD_PLATFORM_LIB)
-
-# Shared library support stuff
-SHAREDLIB_SUFFIX   = a
-PythonSHAREDLIB_SUFFIX = so
-SharedLibraryFullNameTemplate = lib$$1$$2$$3$$4.$(SHAREDLIB_SUFFIX)
-SharedLibrarySoNameTemplate = lib$$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = lib$$1$$2$$3.$(SHAREDLIB_SUFFIX)
-SharedLibraryPlatformLinkFlagsTemplate = -shared -fPIC -Wl,-brtl -Wl,-bexpfull -Wl,-blibpath:/lib:/usr/lib:$(prefix)/lib
-
-endif	# Compiler_GCC
+endif	# compiler not gcc
 endif	# AIX
 
 ###################