--- make/unix.mak.orig Tue Jan 17 13:57:17 2006 +++ make/unix.mak Tue Feb 14 15:12:55 2006 @@ -871,9 +871,9 @@ endif ifndef PTLIB_ALT -PLATFORM_TYPE = $(OSTYPE)_$(MACHTYPE) +PLATFORM_TYPE = else -PLATFORM_TYPE = $(OSTYPE)_$(PTLIB_ALT)_$(MACHTYPE) +PLATFORM_TYPE = endif ifndef OBJ_SUFFIX @@ -939,15 +939,15 @@ PW_LIBDIR = $(PWLIBDIR)/lib # set name of the PT library -PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX) +PTLIB_BASE = pt_$(OBJ_SUFFIX) PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX) -PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX) +PT_OBJBASE = obj_$(OBJDIR_SUFFIX) PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE) # set name of the PW library (may not be used) -PWLIB_BASE = pw_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJ_SUFFIX) +PWLIB_BASE = pw_$(GUI_TYPE)_$(OBJ_SUFFIX) PWLIB_FILE = lib$(PWLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX) -PW_OBJBASE = obj_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX) +PW_OBJBASE = obj_$(GUI_TYPE)_$(OBJDIR_SUFFIX) PW_OBJDIR = $(PW_LIBDIR)/$(PW_OBJBASE) ###############################################################################